am c55c4a28: am b14dc048: Merge "Add new "preinstalled" permission flag." into mnc-dev

* commit 'c55c4a289c6f2ee5c1436af274b9e5eeaf1566f8':
  Add new "preinstalled" permission flag.