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

Merge changes from topic "presubmit-am-aa52f852a18e47f0a700e433e34596a3" into tm-mainline-prod am: a564c97b

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



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