[automerger skipped] Merge "Remove the replaced activity checking to impact...

[automerger skipped] Merge "Remove the replaced activity checking to impact launching performance" into sc-v2-dev am: 6dbc3835 am: 9673300e -s ours

am skip reason: Merged-In Id8e2144a5965601be9c290bc4df6db0d0beb0917 with SHA-1 0eb6c4fb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426486

Change-Id: I2073b00d3267f7dd33ba137a76238d56134e325a