[automerger skipped] Merge "Cache mechanism for Storage page" into tm-dev am:...

[automerger skipped] Merge "Cache mechanism for Storage page" into tm-dev am: d3cb79a1 -s ours am: bb45fcc0 -s ours

am skip reason: Merged-In I75533742a025dc61116207285a894ee728d0af68 with SHA-1 c23be3fa is already in history

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

Change-Id: I712484100fabea9edbb574c20c02697396313b36