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

Change-Id: I1058418e9df7965046a6387594c60fb3e8fad629