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

* commit '04a1cac9374326b320e8cecaae3a1156662901b7':