Merge "GATT: Expose opportunistic client API to Java" am: 782ba0aca8
am: f0efa2c810

Change-Id: I242ede1cfe035f51920a5a1cb90cf0616bae1e93