[automerger skipped] Merge "Protect account chooser activities against...

[automerger skipped] Merge "Protect account chooser activities against overlay." into qt-dev am: 7f2257fa am: 683623e8 am: be186dc3 am: fb086fff -s ours

am skip reason: Change-Id I3cd5a94386f15cf60a7fe3095b00815e4a6485ae with SHA-1 7563c0bb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82afd5bb664d4cca8264a5546d5fc78add0fee44