Merge changes from topic "am-416f80ef74bc451099b70db43b007382" into...

Merge changes from topic "am-416f80ef74bc451099b70db43b007382" into tm-qpr-dev-plus-aosp am: 23f0eb59

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



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