[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" into tm-dev am: 7b11af45 am: 4af57483 am: ac4a760d am: 3abc0283 -s ours

am skip reason: subject contains skip directive

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



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