Merge "MediaRecorderClient: Use checkService instead of getService for camera am: 58aef30341 am: 7273055732" into nyc-mr2-dev-plus-aosp