Merge changes from topic "aris-revert-resubmit-sc" into sc-dev am: c8c419d53f am: 4baf5c10e2 am: 2d80624cd8 am: 694c0658ec am: a2de0ec4b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21611508 Change-Id: I64f6901959f821fd5615aa1149b5b74a892ca8ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: