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

Change-Id: Iff6aacfe864d7a7548ab461ae704fafe2ba92fde