Merge changes from topic "am-773055a805fe4b6bb535fa0544e68b82" into...

Merge changes from topic "am-773055a805fe4b6bb535fa0544e68b82" into tm-qpr-dev-plus-aosp am: 000dacbf

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



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