Merge changes from topic...

Merge changes from topic "presubmit-am-2613dc5aeb9b4fa1a17905710745009a-sc-dev" into sc-qpr1-dev am: af5c39e7

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



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