Merge \"Grant Camera Permissions to DialerPackage\" into nyc-mr1-dev
am: 7280e66e04

Change-Id: I4a914460a950cfcdf481e215b4a260d06f1b9c00