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

* commit '39066abb5929622a1918805bf85d19180c6dfe3d':
  Include work app in battery optimization settings

Change-Id: I3603894e9aca5b1dbe2ed0f6615ac8467e470a82