Merge "Fix the race between entitlement start/stop"
am: 0a4baeae84

Change-Id: If28fb2159672cf58058229f4cb7ee2d549ca15a8