Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d
am: 593049c1d4

Change-Id: I9912ab553f344a57d56de0660a6375becb992274