[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: 7da79e2d am: 57461b3d am: d7b16b5e -s ours

am skip reason: subject contains skip directive

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



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