Merge "Hide battery string for general Android TVs" into oc-dev
am: 6ab19242f3

Change-Id: I2dc47d02133b0325184e5ba838bebbb8188d1f93
tree: 9e4dd96467a67669dacfc5fe48b19dd6fd8c0d0a
  1. QuickSettings/
  2. Settings/
  3. PREUPLOAD.cfg