Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067c2 am: 64a1fbb8cf
am: 874ab0ef21

Change-Id: Ib5b30de21a15ee6220ad4aa143216fb10839d709