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