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

Change-Id: Icb1b568faee09aa2113c1d832974f37d21ee96b0