Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource...

Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" into tm-dev am: 7b11af45 am: 4af57483

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



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