Merge "Update edit text padding on Bluetooth device renaming dialog" into...
Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev am: dcc265dc am: 9cdaba38
am: 85259477
Change-Id: Ia1fdc6fcf607a7ee827cfd48141cf37653a3a519