Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into...

Merge changes from topic "presubmit-am-8a8e3596ba7142d4b3706c0f64416d32" into sc-qpr1-dev am: 4937db24 am: 4f9eeddd am: 7dbcebf2

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



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