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

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



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