Merge "Prettify the captive portal sign-in activity" am: 5dbdffbf81 am: 6e145ffb0e am: 6e238648c2  -s ours
am: 5ad47e271c  -s ours

Change-Id: Ia63a899cf2c50b7b8a6197d61c153db5ae919e8d