[automerger skipped] Merge "Fix the race between entitlement start/stop" into...

[automerger skipped] Merge "Fix the race between entitlement start/stop" into qt-r1-dev am: 5d6e9877 -s ours am: 388295e9 -s ours
am: 3b809b6a -s ours
am skip reason: change_id I63f858356b4543b5bdda41d03e45adc944b86da3 with SHA1 4f95975c is in history

Change-Id: I835b90f3c40ab8c84569913e180532b3fc6e8d6a