[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: 29226940 -s ours am: 65cb0684 -s ours am: 1e7a44d0 -s ours

am skip reason: Change-Id Id974769a4e9d89c01890b7557dd93f8444a3908f with SHA-1 463979ef is in history

Change-Id: I4da67d465b71ad1a2a3111f489f6ff4082a58057