Merge "Set advanced battery usage items as non-selectable" into oc-dev am: d77b699e60
am: 92661526d4
am: 827ce8bc90
Change-Id: I9e69ee5b898820fc21b87b5a6faf858b14f85b1c
This commit is contained in: