Merge changes from topic "cherrypick-266824653-4jjfhctv6n" into tm-qpr-dev-plus-aosp am: baa780a5 am: 8d81bbcc am: 0d0de210

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



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