[automerger skipped] Protect account chooser activities against overlay. am: fedbadf57e am: e1d00ab8b8 -s ours am: be9c053cef -s ours am: 948bd61f09 -s ours am: 065fbe9cae -s ours am: 91b1893603 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7515c5d471509c53b234d43432ced958e979c84e