Merge changes from topic "am-55c5397bff6a4f50bf27976d8d937343" into...

Merge changes from topic "am-55c5397bff6a4f50bf27976d8d937343" into tm-qpr-dev-plus-aosp am: 8e96b3fc

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



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