Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc186f am: 024d224ddd

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

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