Merge "DiskStatsService: stop checking for full-disk encryption" am:...

Merge "DiskStatsService: stop checking for full-disk encryption" am: ca46dc18 am: 024d224d am: 3fc85daf am: 912ef9c9

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



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