Merge changes from topic "presubmit-am-77b3b2d8d8b04e6abd7f7148c74f7ca8" into...

Merge changes from topic "presubmit-am-77b3b2d8d8b04e6abd7f7148c74f7ca8" into tm-mainline-prod am: 5ae2cad6

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



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