tree 64e2d863e05073c85a89e48efd0ac7f882f5e422
parent bf21ae419d9cd3afabe27c2e7955ffa631aad83f
parent fef9702bbac592480e1237ccd5a921baf7a1114c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594076430 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594076430 +0000

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