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

Change-Id: Ied27384d32ccc50c3678c6517910c633498d8ee7