Merge "Include work app in battery optimization settings" into nyc-dev am: 39066abb59 am: 5b935c170a
am: 87bd731e19

* commit '87bd731e19b9d94771327fd3eeabc7836d72f1d6':
  Include work app in battery optimization settings

Change-Id: Idd7e011326f459ccd732efd80bbbb8e152c897ac