Merge changes from topic "presubmit-am-589bb396d75b41b3b75c505833d386dd" into tm-qpr-dev-plus-aosp am: 6d6eadb4 am: 6fb036fe

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



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