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

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



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