[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: 0238b0a3 am: 7bda3b4c am: 82c5287a -s ours

am skip reason: subject contains skip directive

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



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