Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev am: dcc265dcbf am: 9cdaba3861
am: 8525947779

Change-Id: Ia1fdc6fcf607a7ee827cfd48141cf37653a3a519