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

Change-Id: Ia4c2a0f1e330916e0f841301ff35b81e04d88054