Merge changes from topic "am-3b53c87eb8b44708872c3bea0a97e04d" into tm-qpr-dev-plus-aosp am: 214e24ae

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



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