Merge "Add OEM config for enhanced confirmation mode and add restricted read...

Merge "Add OEM config for enhanced confirmation mode and add restricted read ops" into tm-dev am: 0fbae018 am: e54500ec am: ccee1eb4 am: ad4c6f95

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



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