Merge "Camera: Annotate 'getKeysNeedingPermission'"