Merge \\"Add titles to PreferenceFragments and PreferenceScreens for watches.\\" into nyc-mr1-dev am: 9f3930d3 am: 26f2103f Change-Id: I4780f95676a9371d50a622315fbc70cacbeba401