Merge changes from topic "presubmit-am-2212392d9aa44292be5190d5edb8fd96" into...

Merge changes from topic "presubmit-am-2212392d9aa44292be5190d5edb8fd96" into tm-mainline-prod am: f38a32ab

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



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