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

Change-Id: Ib15758ab3def0b2440f2a86314fa601da40bf269