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

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



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