Merge \"Add titles to PreferenceFragments and PreferenceScreens for watches.\" into nyc-mr1-dev
am: 9f3930d3f7

Change-Id: If4a1d8df880391dc26d608b2486433142b46d317