Merge "Merge "Include work app in battery optimization settings" into nyc-dev am: 9b167a6878
am: 43effe8441" into nyc-mr1-dev-plus-aosp
am: 96deee3522
* commit '96deee3522d03bf0b174a226c0f67eca607ae575':
Change-Id: I576648c71c5c32923d5565d987bc27e39df0f484
This commit is contained in: