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

Change-Id: I03c108b9a4712205906125ea12114e4ed6659255