[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

Change-Id: Id5a442c513e67f70d37f72b3f2a4a2742171d7d1