Merge changes from topic "presubmit-am-032b75464d75462f9af7baff82a93ac3" into...

Merge changes from topic "presubmit-am-032b75464d75462f9af7baff82a93ac3" into tm-qpr-dev-plus-aosp am: 7a67c264 am: 2023485b am: ed1b83f7

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



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