Merge "Merge "[SettingsProvider] enforce permission on openFile" into tm-dev...

Merge "Merge "[SettingsProvider] enforce permission on openFile" into tm-dev am: 0cb62fa9 am: 3309354b" into tm-d1-dev-plus-aosp am: 8b3bb2d2 am: aaac680a

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



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