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

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

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