[automerger skipped] Merge "[DO NOT MERGE] Unfold refactor" into sc-v2-dev am:...

[automerger skipped] Merge "[DO NOT MERGE] Unfold refactor" into sc-v2-dev am: 6bd4a663 am: d648a902 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I997d48c3d8750aa7a9e9dd7466849c532e313e83