Merge "Removing Dead Flag Test: CI Bug: 386652866" into main am: c169be3320

Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/3430949

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