Merge "Include work app in battery optimization settings" into nyc-dev am:...
Merge "Include work app in battery optimization settings" into nyc-dev am: 39066abb am: 5b935c17
am: 87bd731e
* commit '87bd731e':
Include work app in battery optimization settings
Change-Id: Idd7e011326f459ccd732efd80bbbb8e152c897ac