Merge "Update subtitle for apps in battery settings" into oc-dev
am: 031b90541f

Change-Id: I7ec1ee37eb42d5523502ae3a17694f61ea6197ba