Merge "Include work app in battery optimization settings" into nyc-dev am:...
Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a68 am: d932c418
am: 58d16d50
* commit '58d16d50':
Include work app in battery optimization settings
Change-Id: Ia9a5c9a1948f6d489213022644888ec310d17ac9