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

Merge changes from topic "presubmit-am-a097d19b46714d919133992650772d7d" into tm-mainline-prod am: d2d6180c

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



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