Merge "Add accessibility hooks for Preference, provide a11y header info" into nyc-dev am: cb26d0e1ce
am: a0e2eb447e

* commit 'a0e2eb447e173b98b6d60e459ddb44a20b9505cc':

Change-Id: Ic0e20718864ac5b7786dfb7c5cfaad3b8964263c