Merge changes from topic "am-57e0d74080e946758c2b4cbce9ad25bc" into...

Merge changes from topic "am-57e0d74080e946758c2b4cbce9ad25bc" into tm-qpr-dev-plus-aosp am: b8ab4101

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



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