Merge changes from topic "presubmit-am-dbbf3fe15cfd41418536f2a1dc34cd14" into...

Merge changes from topic "presubmit-am-dbbf3fe15cfd41418536f2a1dc34cd14" into tm-qpr-dev-plus-aosp am: 1901131a am: f15c7ae7 am: 60523247

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



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