[automerger skipped] Prevent apps from spamming addAccountExplicitly. am: 551d70e1c8 am: 662fcc58ef -s ours am: 9290f7b31f -s ours

am skip reason: skipped by user aseemk

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

Change-Id: I5a72771f4f34a80595883b8cdca8928f53607d06