Merge "Fix bug on DC#ensureActivitiesVisible" into main am: 7bb03ce9e5 am: 8638d38518 am: 20e993fe51

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

Change-Id: Ia4da51b59b82755ca8e9d302e179d244b9f4ccf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>