[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: 49d81c64 -s ours

am skip reason: subject contains skip directive

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



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