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

Merge changes from topic "presubmit-am-b6516f7bf55346dda9194c8d19120348" into tm-mainline-prod am: 7c0c83ed

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



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