am 062a865f: am 04a1cac9: (-s ours) am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev

* commit '062a865ff8e3d163757d3bc724e77cc94563751f':