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

Merge changes from topic "presubmit-am-da4b795c63474075bda931dc84e3ba04" into tm-mainline-prod am: ebcda6d4

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



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