Merge "Add OEM config for enhanced confirmation mode and add restricted read ops" into tm-dev am: 0fbae018dc am: e54500ec33 am: 0c42b556bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17620163 Change-Id: I9d764278017545fbac0d9c00b3982e3829f7eba3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: