am cd4104e8: Revert "Revert "Dynamic insertion of pubkey to mac_permissions.xml""

* commit 'cd4104e84b438827fddd6a7fe6cb86e91392152d':
  Revert "Revert "Dynamic insertion of pubkey to mac_permissions.xml""