Merge changes from topic "presubmit-am-6c9d45f3c448459988f5ee40b416e0db" into...

Merge changes from topic "presubmit-am-6c9d45f3c448459988f5ee40b416e0db" into tm-mainline-prod am: 28a6327f

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



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