Merge "audit mtp sync permission" am: 6fc134e3e5 am: 4c445999d1
am: 34ef55c0fb

* commit '34ef55c0fb00aee6f8cf3a616abf36107e598ff8':
  audit mtp sync permission