Merge "Merge "Check PendingStartActivityUids in getAppStartModeLocked." into rvc-dev am: 66929380 am: 235421cc am: f9301fd8" into rvc-qpr-dev-plus-aosp