Merge changes from topic "am-cc6692079137467f905c75192fbb876c" into...

Merge changes from topic "am-cc6692079137467f905c75192fbb876c" into tm-qpr-dev-plus-aosp am: 98995e96

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



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