Merge "Merge "Update docs for UID_STATE" into qt-dev am: 261a2d62 am: f821b5df" into qt-r1-dev-plus-aosp am: 7b744075 Change-Id: If3f6227956f58f95d1d0dfcee0b5f7ecea79f0c3