Merge "Merge "Lower error if diskstats cache file not found" into rvc-dev am:...

Merge "Merge "Lower error if diskstats cache file not found" into rvc-dev am: 494b541a am: 2d9361b0" into rvc-d1-dev-plus-aosp am: 0dbe4e59

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11750085

Change-Id: Ibf54f2d6b4524dd6ba7ce17be7364d644763d849