Merge changes from topic "am-476cc199c5974285b2f4db9e4b05d071" into tm-qpr-dev-plus-aosp am: 9aaa6e3b am: 8e489ed6 am: 595de52d

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



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