tree 7c60eb4dc4221f49e03ac7738673d5d37ddc943a
parent 1c744c996cc0821d1db7dbbd0d5ee1fc9eb08ae6
author Sunny Goyal <sunnygoyal@google.com> 1670482117 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1670523355 -0800

Removing some unnecessary interfaces and merging them to ActivityContext

Bug: 259733681
Test: Everything compiles
Change-Id: If6b530f6e589a851cf8554f5de0849843bd66dd4