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: I55c16feb807f9df56abc368cd33523d1bcf27f73