Merge changes from topic "am-32da6096b077473ab33f3beed613898e" into...

Merge changes from topic "am-32da6096b077473ab33f3beed613898e" into tm-qpr-dev-plus-aosp am: 2fb3bda3

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



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