Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev
am: 8d16d7915d

Change-Id: Ib34226b3ce41e83ae018c86d5a4e53564e207b46