Merge changes from topic "am-52f1e073427d431498ea82df3bd4b4e1" into tm-qpr-dev-plus-aosp am: 788156f6

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



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