Merge changes from topic "am-40559840b5514ebe81e25822e5226af3" into tm-qpr-dev-plus-aosp am: e4c8bcb4

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



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