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 am: 6c26e1bd

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

Change-Id: I6ea667c1d375fff9c7b0e879f9b980b8476ed75d