Merge "Removing remaining references of ActivityView in fw/base" into sc-dev am: dc86e26f am: cedbffeb am: 4f4afcd9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14829810

Change-Id: Ie90d5eaa7262a1d765e518cd64a9e81607d231fd