Merge changes from topic "am-3703178f80294e8e8863e6950a6243eb" into...

Merge changes from topic "am-3703178f80294e8e8863e6950a6243eb" into tm-qpr-dev-plus-aosp am: 1d34cd31

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



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