Merge changes from topic "am-1015f4fc18564325a5b01eb2812bd6ef" into...

Merge changes from topic "am-1015f4fc18564325a5b01eb2812bd6ef" into tm-qpr-dev-plus-aosp am: 5faa8d3c

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



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