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

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

Change-Id: I960c53e49d5594e0867460bfb45007a465abf3ee