Merge changes from topic "presubmit-am-63dae37384ff42c4ad3ee8cab0e7dbc9" into...

Merge changes from topic "presubmit-am-63dae37384ff42c4ad3ee8cab0e7dbc9" into tm-mainline-prod am: b2799663

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



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