Merge changes from topic "presubmit-am-4b02653e83b548f494f92f7a023c91b9" into...

Merge changes from topic "presubmit-am-4b02653e83b548f494f92f7a023c91b9" into tm-mainline-prod am: 116a9407

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



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