Settings: we are on https now

Change-Id: Iadf2d02fa9655c8db1537ac2cbdbaa4f6d8904d2
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4