Merge "Validate platform defined permissions are not altered" into marshmallow-cts-dev
am: 4896c90b6b

* commit '4896c90b6b0360bfb8f3fb2f70fd5bf1572fd768':
  Validate platform defined permissions are not altered