Merge changes from topic "presubmit-am-740c2ffbbb474beca0a636ae09435821" into...

Merge changes from topic "presubmit-am-740c2ffbbb474beca0a636ae09435821" into tm-mainline-prod am: dc8a321a

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



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