Merge "Hide battery percentage from accessibility." into oc-mr1-dev
am: f4311433a8

Change-Id: If3a0b173905140a4498f0bcb0a925614301b078a