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

Merge changes from topic "aris-revert-resubmit-sc" into sc-dev am: c8c419d5 am: 4baf5c10 am: 2d80624c am: 694c0658 am: a2de0ec4 am: dc7f62fd

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



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