[automerger skipped] Merge "FlaggedApi: enable enforcement for all...

[automerger skipped] Merge "FlaggedApi: enable enforcement for all non-updatable APIs" into aosp-main-future am: f1c2cd8e am: a9e51bce -s ours

am skip reason: Merged-In If7333ead86d9028ab0a1cc8f25fc534cb13a1858 with SHA-1 38dd161e is already in history

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



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