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

Merge changes from topic "presubmit-am-a0cf36d7c4c54290aaa07f88d08da016" into tm-mainline-prod am: 0d977863

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



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