Merge changes from topic "aris-revert-resubmit-sc" into sc-dev am: c8c419d53f am: 4baf5c10e2 am: 2d80624cd8 am: 694c0658ec am: 4593596a9a am: 0f58ef4f65

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

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