Merge changes from topic "presubmit-am-4cfc5fcc7fcb4e28a3c5befdc77cd3ea" into...

Merge changes from topic "presubmit-am-4cfc5fcc7fcb4e28a3c5befdc77cd3ea" into tm-mainline-prod am: 35fa3aea

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



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