Merge changes from topic "presubmit-am-37de191e8f264fc2890d1cc94278eaff" into sc-qpr1-dev am: e531ea8f

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



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