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

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

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



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