Merge "PermissionRequest: Only handle video capture am: 14260bad am: c8243400 am: 3c482695" into nyc-mr2-dev-plus-aosp am: 69fe544c Change-Id: I635b4fb3b437273f318f01e2c5841db23d16e227