Merge changes from topic "presubmit-am-66f9fba9d0a249a588735f9b6b3a2a81" into...

Merge changes from topic "presubmit-am-66f9fba9d0a249a588735f9b6b3a2a81" into tm-mainline-prod am: 5da91192

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



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