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

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

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