Merge changes from topic "am-55c5397bff6a4f50bf27976d8d937343" into tm-qpr-dev-plus-aosp

* changes:
  Merge "Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs""" into tm-dev am: 2c18b2e1 am: 7da79e2d am: 3c9a9558
  Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" am: 704a86f3 am: 965185b7 am: 29bdc3e3
  Merge "Add device policy manager namespace to public namespaces" into tm-dev am: 8293974f am: 1368e8a5 am: 38c1a791