Merge changes from topic "am-7f97f9a8316e4f0d82a735285252fecf" into...

Merge changes from topic "am-7f97f9a8316e4f0d82a735285252fecf" into tm-qpr-dev-plus-aosp am: 98432cd9

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



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