Merge "Merge "DPC should not be allowed to grant development permission" into oc-dev am: 5e4b2b15ec am: f1aea743fd am: 0b80fb29b1" into oc-mr1-dev-plus-aosp
am: ebb4cf4b51  -s ours

Change-Id: Ia17b46b323102e40194dce6c69bcd915db1a8356