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

[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" into tm-dev am: 7b11af45 am: 2ce51a33 am: 2e87d56f am: ad00ad44 -s ours

am skip reason: subject contains skip directive

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



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