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

Change-Id: I0d9195100d08f80c5a8ac7f15d96b7372320efb6