Merge "Storage Settings crash" into tm-dev am: 241238c6

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



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