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

Change-Id: I2868f4729a4413b634c14d197432d8ff47f51a7b