Merge changes from topic "presubmit-am-5afc0bf9bc1d45e795f2a48bfafc5aea" into...

Merge changes from topic "presubmit-am-5afc0bf9bc1d45e795f2a48bfafc5aea" into tm-mainline-prod am: a7f5bd49

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



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