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

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



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