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

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



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