Merge "Add uid to PendingStartActivityUids when activity resumed." into rvc-dev am: c05fd22c am: eb487f61 am: 8e5f5b32 am: 70ea2efd

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

Change-Id: I2929326e62773cc995dba35aad9a5f9383af076b