Merge changes from topic "presubmit-am-ef151c307ae248f68a837626b68f7f04" into...

Merge changes from topic "presubmit-am-ef151c307ae248f68a837626b68f7f04" into tm-mainline-prod am: 21bfc0dd

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



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