[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am: 8d16d7915d am: eaa6d200b3  -s ours am: 4d94bf0498  -s ours am: df1dbb0bfa  -s ours
am: c34fb2b13e  -s ours

Change-Id: Ia8a8f54a4a47d881bc0357ff8fa819c67417e61f