Merge "Change Bluetooth HID Profile Name (1/6)" am: 8218b219f3 am: c8a370aeba
am: 5140894a5d  -s ours

Change-Id: I2a9e23646d21bc97b02e9648704e5f766432d3cd