Merge "Show app battery usage in correct user" into oc-dev am: 7226c9f4c4
am: f7c007b2c1  -s ours

Change-Id: I77d663cdd0c9dc6a3a411789591421a238a76766