Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067 am: 64a1fbb8 am: 874ab0ef Change-Id: Ib5b30de21a15ee6220ad4aa143216fb10839d709