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

Change-Id: Ie8f51862ce2cc860c6fe532899b5f072b68beb1a