Merge changes from topic "presubmit-am-26cd630fe4764e5eaaa4330c4c65bd6a" into...

Merge changes from topic "presubmit-am-26cd630fe4764e5eaaa4330c4c65bd6a" into tm-qpr-dev-plus-aosp am: 9e097090 am: 13bb0623

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



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