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

Change-Id: I8b4ede5d116cf753d3db9ab78fc027505acd2ef0