[automerger skipped] Merge changes from topic "revamp storage settings header" into sc-dev am: d7fff5790a
-s ours
am skip reason: skip tag Change-Id I85fa117ff0a49ec7a53ba36580591c7ce7f5a8dc with SHA-1 ba79fe6676
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13715539
Change-Id: Iec1d57d81fc875cfda6b940da4c717ca63ba4311
This commit is contained in: