Merge changes from topic "presubmit-am-8a7e58f5dc644d6187d5d4cd1eba68a2" into...

Merge changes from topic "presubmit-am-8a7e58f5dc644d6187d5d4cd1eba68a2" into tm-mainline-prod am: b4ec575c

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



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