Merge "Merge "Update docs for UID_STATE" into qt-dev am: 261a2d62 am: f821b5df" into qt-r1-dev-plus-aosp