Merge changes from topic "presubmit-am-8892555377a6429fb522f9a877d124f5" into...

Merge changes from topic "presubmit-am-8892555377a6429fb522f9a877d124f5" into tm-mainline-prod am: d04b30c7

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



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