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

Merge "Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs""" into tm-dev am: 2c18b2e1 am: 0238b0a3 am: 7bda3b4c

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



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