Merge changes from topic "presubmit-am-03c717081b8041d984fabd05965efce5" into...

Merge changes from topic "presubmit-am-03c717081b8041d984fabd05965efce5" into tm-mainline-prod am: ec071652

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



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