[automerger skipped] Protect account chooser activities against overlay. am:...

[automerger skipped] Protect account chooser activities against overlay. am: fedbadf5 am: e1d00ab8 -s ours am: be9c053c -s ours am: 948bd61f -s ours am: 065fbe9c -s ours am: b5bd72d9 -s ours

am skip reason: Change-Id I1a16808426934f4a8d12410576d769443e4c2a04 with SHA-1 6ff42dd2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib84d7ab34c9d8a54f17f313d05debc388a0861fd