Merge changes Ia7918022,Iabd5a4e9 into main

* changes:
  Remove permission based active admin.
  Remove mActiveAdmin from EnforcingAdmin