Merge "Handle picker defaults for notification and alarm" into nyc-mr1-dev
am: baeea4e0d1

Change-Id: I8f7bd67c8e6012c6605e674a4333ca204ef317b3