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

[automerger skipped] FlaggedApi: enable enforcement for all non-updatable APIs am: c6b88d7b -s ours am: 4c3df400 -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: Ib9f7713f2f9c8704565fb3d3edaa5f7b35ef7af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>