Merge changes from topic "aris-revert-resubmit-sc" into sc-dev am: c8c419d5

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



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