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