Merge changes from topic "presubmit-am-6fdfbe39c42b4f2494a48e8d3918acc0" into...

Merge changes from topic "presubmit-am-6fdfbe39c42b4f2494a48e8d3918acc0" into tm-mainline-prod am: 825609d2

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



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