Merge "Merge "MediaRecorderClient: Use checkService instead of getService for camera" into cw-f-dev am: 2d1a878732 am: cd161f1f66" into nyc-mr2-dev-plus-aosp