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

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

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

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