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

Merge changes from topic "presubmit-am-deecaf128bd2470c83cb1c39bf3921e3" into tm-mainline-prod am: a039f1ee

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



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