[automerger skipped] Merge "Revert "[automerged blank] Disable pointer authentication in app..."" into sc-v2-dev-plus-aosp am: 30ea8d1084 -s ours
am skip reason: Merged-In I3030c47be9d02a27505bd4775c1982a20755758c with SHA-1 69538cf7f3 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16713103
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17214407
Change-Id: Iad78aba1d12a4146ed628850cd3920f197bd96a8
This commit is contained in: