Merge "Merge "Update subtitle for apps in battery settings" into oc-dev am: 031b90541f
am: 6525053801" into oc-dr1-dev-plus-aosp
am: 8fcd16a93f
Change-Id: If549bb552df5b50f2ee69ade4b616a1e0cc17e33
This commit is contained in: