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: 0a4bbff8

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



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