[automerger skipped] [DO NOT MERGE] Use PermissonChecker for runtime permissions am: 65e3af83ea
am: 198595ee87 -s ours
am skip reason: subject contains skip directive

Change-Id: Id2b0367dd9aecae33f2c55194c3a588312de73e1