Merge "Removing remaining references of ActivityView in fw/base" into sc-dev am: dc86e26f am: 1b1d2d5d am: a1512d26

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

Change-Id: I61102baec002fe4de81e889d9e945ab5aa2cbe14