Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22ce1

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

Change-Id: Ie1ac5bbc2ee1e2af4708c8e584568f8f3d6cecb3