Merge "Merge "Add atom for general external storage access stats" into rvc-dev am: b1951ee22d am: 43275e95d5" into rvc-d1-dev-plus-aosp am: 1f87922b9e am: 0a2fc9a94d

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

Change-Id: I57c3d6719e55318b88af8ec7fe60404f13b79a22