Merge "Fix the race between entitlement start/stop" into qt-r1-dev
am: 5d6e98773f

Change-Id: I93579ad97c4acaf9c0f362a5adf2136b134050fb