Merge changes from topics "presubmit-am-166ca8e59ac8499bb6b4f4cad6aae045",...

Merge changes from topics "presubmit-am-166ca8e59ac8499bb6b4f4cad6aae045", "presubmit-am-1a825bf4d182432b91541a8629e0e351" into tm-dev am: 2c06ff3d

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



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