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

Change-Id: I7c41230d9a99490d4a71811db13e691f18b30753