[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: 3c9a9558 am: 4cc4b29a -s ours

am skip reason: subject contains skip directive

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



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