Merge changes from topic "am-c8328431a47c4eebb006716640e11064" into tm-qpr-dev-plus-aosp am: e54ed7c2

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



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