Merge "Add cache mechanism for secondary users in Storage" into tm-dev am:...

Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad am: 9cbec637 am: d65718e4

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



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