Merge "Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev...
Merge "Merge "Change Priority Only mode defaults on watches" into nyc-mr1-dev am: 91dd6209" into nyc-mr1-dev-plus-aosp
am: eb51b86a
* commit 'eb51b86a':
Change Priority Only mode defaults on watches
Change-Id: I9dee4245b8f9a0b44e94f08b4debd078a959ec3c