Make the estimator cache logic is the same as SysUI flow am: 53f48c4a am: 7dec6037

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



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