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

[automerger skipped] Merge "FlaggedApi: enable enforcement for all non-updatable APIs" into udc-dev-plus-aosp am: 9ede4fb9 -s ours am: 2d8f7649 -s ours

am skip reason: Merged-In I4d384efac8a8d3b183d9b207b195ad5489db9e55 with SHA-1 36d19aea is already in history

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



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