[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: 965185b7 am: df75390c am: 736ab00f -s ours

am skip reason: subject contains skip directive

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



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