Merge "Merge "Add check for cross user permission" into rvc-dev am: edd9383a...
Merge "Merge "Add check for cross user permission" into rvc-dev am: edd9383a am: 061c1a28" into rvc-d1-dev-plus-aosp am: 78a84b11
Change-Id: I36e680434a243c05812b7d191bc99bf843def54d