Merge changes from topic...

Merge changes from topic "presubmit-am-c762bda6d9d74477b7e7c4bed647a510-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: aacd20af am: bd8961c4

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



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