DO NOT MERGE: Fix incorrect use of UserHandle#getUserHandleForUid(int uid)

Two issues are mixed here.
issue 1) User ID was used when UID was necessary.
issue 2) Caller UID was used when checking target UID.

Note that this bug would affect multi-user environment.

(Cherry-picked from 33240ae97c9f65a1e1d2526f1447e9f5a18dee98)

Bug: 162548695
Test: Build and run CTS
Change-Id: I19287ed11d8f9fdd1b966ec2c671f5b0913064ed
2 files changed