[automerger skipped] Merge "RESTRICT AUTOMERGE Add feature flag to disable...

[automerger skipped] Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822 am: f0e44016 -s ours

am skip reason: subject contains skip directive

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



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