[automerger skipped] Merge "Force update uid state when pending uid state is applied" into qt-dev am: 4abf162016 am: 418cefa8a4 -s ours am: 29226940d7 -s ours am: 5e0409d3e5 -s ours
am skip reason: Change-Id Id974769a4e9d89c01890b7557dd93f8444a3908f with SHA-1 463979efc3 is in history
Change-Id: I4fa6cfc5dd70eca74f5e7c1c8a74dc17d393de7a
This commit is contained in: