Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408

Change-Id: I1fb9b0fa22efc35088221f47e50cfa37194fb167