Merge changes from topic...

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

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



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