Set 24 hour pref. with ACTION_TIME_CHANGED.

Sent as a boolean extra EXTRA_TIME_PREF_24_HOUR_FORMAT.

Change-Id: I7fbd59eacdeb298d046da950d7045f0bab53b462
Merge "Set 24 hour pref. with ACTION_TIME_CHANGED."
Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."

This reverts commit d5d9d373619de3437593763578854a83f5539306.

Change-Id: I76eeb6f95a4cbbd241db1fb90528b4d91ddf7707
Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
HTML injection fix for bluetooth pairing, issue 65946

During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML

Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
Merge "HTML injection fix for bluetooth pairing, issue 65946"
Revert "Forward Port Circle Battery"

This reverts commit 0a775de7430f51bbb50b07103b4d779c2e99a360.
Merge remote-tracking branch 'aosp/master'