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

Merge changes from topic "presubmit-am-cbc3dc3a1fb64fea92fed20dc6a3f23e" into tm-mainline-prod am: 117aa0eb

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



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