Merge "[DO NOT MERGE] Unfold refactor" into sc-v2-dev am: 6bd4a6638a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16184612 Change-Id: I6c117f89882006661ab5520c2da38770336b6c75
This commit is contained in: