am 05499745: am f4cfaedb: am b08f69d6: Merge "CTS test for runtime permission grants" into mnc-dev

* commit '054997455eb1b920e856cec564dd715bc2155f6b':