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: 7da79e2d am: 57461b3d

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



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