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

[automerger skipped] Merge "FlaggedApi: enable enforcement for all non-updatable APIs" into main am: d0d81bd3 -s ours am: d7f18b50 -s ours am: ad89cecc -s ours

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

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



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