Merge "Merge "Check PendingStartActivityUids in getAppStartModeLocked." into rvc-dev am: 66929380ab am: 235421ccd4 am: f9301fd850" into rvc-qpr-dev-plus-aosp