Removing some unnecessary interfaces and merging them to ActivityContext

Bug: 259733681
Test: Everything compiles
Change-Id: If6b530f6e589a851cf8554f5de0849843bd66dd4
16 files changed