[automerger skipped] Revert "RESTRICT AUTOMERGE Add feature flag to disable...

[automerger skipped] Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" am: 00c0a928 am: dcb81076 -s ours

am skip reason: subject contains skip directive

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



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