Merge "Revert "Deprecate uses of Android Protected Confirmation"" into main am: 8089347daf am: 804101b804

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

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