[automerger skipped] Revert "Revert "RESTRICT AUTOMERGE Add feature flag to...

[automerger skipped] Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" am: 704a86f3 am: 49038ae8 am: 5edc5bd8 am: db6a9f6c -s ours

am skip reason: subject contains skip directive

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



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