Merge "Adds a BigPicAmbient flag to WearableExtender in NotificationCompat" into nyc-dev