Merge "Initialize max number of connected A2DP devices in the native stack via...
Merge "Initialize max number of connected A2DP devices in the native stack via JNI" am: cd2b6399 am: d88a8d57
am: a7ce59f5
Change-Id: I64cbf2c0d9492efef0229192bb5a315f26833631