Merge "Update brightness percentage display logic to match sysui." into pi-dev am: 69d12406f0
am: e9045a7a41

Change-Id: I20c27b31caa7a44b6d114780a0b7b18206f75d12