Merge "Update uid state used for bucketizing data in fg vs bg states." into pi-dev
am: 8303baf4d0

Change-Id: Ia476818fee03347c5d0bf80d3197ef391b9f7c66