Merge changes from topic "presubmit-am-0f75293bffaa4a0ba9a9fa590d91e7a0" into...

Merge changes from topic "presubmit-am-0f75293bffaa4a0ba9a9fa590d91e7a0" into tm-qpr-dev-plus-aosp am: 743fd2bb am: 9c9c1e87

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



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