Merge "Allow only system_server to read uid_time_in_state" am: 439364d2 am: e96aad09 am: 3ce2c6f8 am: 2f0d0496 Change-Id: I0a3b2c00a083bebdf658cd3695d51ed7af21b1ca