[automerger skipped] Merge changes from topic "split-shade-cherry-pick-v2"...

[automerger skipped] Merge changes from topic "split-shade-cherry-pick-v2" into sc-v2-dev am: 52bbb0fe am: 60908719 -s ours

am skip reason: Merged-In Ifea32b10378ed4cc240ea1a95bea12db515479bf with SHA-1 f2083110 is already in history

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

Change-Id: If9d1a2d3df92be3178a1eeee61e03bded392a1d4