Merge "Set advanced battery usage items as non-selectable" into oc-dev
am: d77b699e60

Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13