Merge "Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs""" into tm-dev am: 2c18b2e130
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18344247 Change-Id: I559e05b5464e0f18b7c7d107edaae7492dd7cef0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: