Merge changes from topic "am-2770a49bdf764f0d95dafee4d391aa8d" into tm-qpr-dev-plus-aosp am: fb73b81b

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



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