Merge changes from topics "presubmit-am-5a31146ec7864d04ab14351725610831",...

Merge changes from topics "presubmit-am-5a31146ec7864d04ab14351725610831", "presubmit-am-bcec5630c20a4c7ca37a5694c6a3b126" into tm-dev am: a512a9b9

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



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