Merge "Merge "Check PendingStartActivityUids in getAppStartModeLocked." into rvc-dev am: 66929380ab am: 1cfab36cfc" into rvc-d1-dev-plus-aosp am: 32f6324141 am: fef9702bba

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

Change-Id: Ia2cc6fb40db883eb462e6e234c514eff901a0a2f