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

Change-Id: Id2d529132100406ca0cefd262d738f498439a8b1