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:2c18b2e130am:7da79e2d11am:3c9a955897Revert "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" am:704a86f316am:965185b792am:29bdc3e3f7Merge "Add device policy manager namespace to public namespaces" into tm-dev am:8293974f3aam:1368e8a55dam:38c1a79163
This commit is contained in:
committed by
Android (Google) Code Review
commit
8e96b3fce3