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

* commit '5b935c170a1a746ad33da3d2383913508998db56':
  Include work app in battery optimization settings

Change-Id: I437bafa953979a56314948b5d04e107317384aa3