[automerger skipped] Merge "Force update uid state when pending uid state is...
[automerger skipped] Merge "Force update uid state when pending uid state is applied" into qt-dev am: 4abf1620 am: 418cefa8 -s ours
am skip reason: Change-Id Id974769a4e9d89c01890b7557dd93f8444a3908f with SHA-1 463979ef is in history
Change-Id: I692f910917fe2ea83a46a1f9af54a7eb73d19305