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

Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822

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



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