Merge "Record the UID of the app package instead of GID." am: cbe01c27c6 am: e601c8da21

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668845

Change-Id: Ia0cc68639d059df3969d85c546a1267d53a25d2e