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

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

Change-Id: Ibd3aab6cde137ec145c43da3da2730dd62688d9f