[automerger skipped] Merge "Cache mechanism for Storage page with work...

[automerger skipped] Merge "Cache mechanism for Storage page with work profile" into tm-dev am: 9e9a39d7 am: adab78d3 -s ours

am skip reason: Merged-In I518679f90c63e12f61f08d08d5ed3f3900825be2 with SHA-1 0607c511 is already in history

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

Change-Id: I14b2811a97f5d860d6594615b2919bca9089cf3c