Merge "Add Wearable side of Notification Styles (for 1.0 and 2.0 standalone apps)." into nyc-dev am: 1bc59f4967
am: b934e4a052

Change-Id: Ie7f82d1c8e04f4222457ba300b6eca65be4008c9