Merge changes from topic "presubmit-am-035b011c796442c5a01387637ca9604c" into...

Merge changes from topic "presubmit-am-035b011c796442c5a01387637ca9604c" into tm-qpr-dev-plus-aosp am: 60d439bf

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



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