Merge "[automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 -s ours am: 8fb063eab4 -s ours" into rvc-d1-dev-plus-aosp am: 66f96e7bc0 -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 30c0da71b0 is in history
Change-Id: I7cdfed9925e61980363aa52cc0d8a209c5eeea1d
This commit is contained in: