Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am:...

Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c am: 2341b91f am: 22c4b400 am: 7cf2c08b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346



Change-Id: I2a2d7758da7c9e8484377ecb2a6c5bdc128f2566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>