Merge changes from topic "presubmit-am-92dd22e1e4734cdc8810f040512a28d2" into...

Merge changes from topic "presubmit-am-92dd22e1e4734cdc8810f040512a28d2" into tm-mainline-prod am: 699121bb

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



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