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

am skip reason: subject contains skip directive

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



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