[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: 649c2b24 am: 8628bb8b am: ab8270f4 -s ours

am skip reason: subject contains skip directive

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



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