Merge changes from topic "split-shade-cherry-pick-v2" into sc-v2-dev am: 52bbb0fe

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

Change-Id: I0c8495d98c65d7bf7ab5876630a07c4014cf56c9