[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

Change-Id: I37240064ca3a5c1d7131154bd933e6b4d3e26a60