Merge "Don't show Screen as Apps in advanced battery page" into oc-dev am: 89bc5b2bff
am: 4f016eeb6b

Change-Id: I6524ea22d71d4d7acd6186ebdb62de3cdd89a87d