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

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

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



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