[automerger skipped] FlaggedApi: enable enforcement for all non-updatable APIs...

[automerger skipped] FlaggedApi: enable enforcement for all non-updatable APIs am: 440f3cf2 -s ours am: f343b1ba -s ours am: 18c191ae -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: I3324682164ca3d5d79d236a9299bbae65a45190f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>