[automerger skipped] Merge changes from topics "expandable-activity",...

[automerger skipped] Merge changes from topics "expandable-activity", "expandable-controller", "expandable-dialog" into tm-qpr-dev am: ef833d42 -s ours am: b617ab16 -s ours

am skip reason: Merged-In Iaa39a2c75e8a49770eaf5d8ce66d5ac562d9320c with SHA-1 bde9b5f2 is already in history

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



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