[automerger skipped] Merge "Revert "Revert "RESTRICT AUTOMERGE Add feature...

[automerger skipped] Merge "Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs""" into tm-dev am: 2c18b2e1 am: dfe748c6 -s ours

am skip reason: subject contains skip directive

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



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