[automerger skipped] DO NOT MERGE: Chassify PermissionController am: e861749b65 am: 47da9cb43e -s ours

am skip reason: subject contains skip directive

Change-Id: If936dbd45f18f1cef2ea316a90920cdc2584145f