Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0
am: 1311cf8f80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201 Change-Id: Id0d156cbd9996f6c44450c305ec71b851a340893
This commit is contained in: