Merge changes from topic "am-e77e623de806426d9b94ddc5e2a528c2" into tm-qpr-dev-plus-aosp am: 64e05acf

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



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