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