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

Merge changes from topic "presubmit-am-b87ddd3bbf2947f1aa639cddcee6ecb8" into tm-mainline-prod am: 9f793203

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



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