Merge changes from topic...

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

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



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