Merge changes from topic "presubmit-am-12354d5aed1b43208d3598174f1f4717" into...

Merge changes from topic "presubmit-am-12354d5aed1b43208d3598174f1f4717" into tm-mainline-prod am: 05beaec7

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



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