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: 0c42b556 am: 8770204f

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



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