Merge "Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am: 8d5fd92314 am: ee0a01c8a6" into nyc-mr1-dev-plus-aosp