Merge "Merge "[6/n] Pin ActivityStack" into udc-qpr-dev am: 96add4bc" into...

Merge "Merge "[6/n] Pin ActivityStack" into udc-qpr-dev am: 96add4bc" into udc-qpr-dev-plus-aosp am: f941fa76

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



Change-Id: I489d22e54fc4b5c0f6a87b43b65fb71b8ebb33f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>