Merge "[automerger skipped] Prevent apps from spamming addAccountExplicitly....

Merge "[automerger skipped] Prevent apps from spamming addAccountExplicitly. am: 551d70e1 am: 662fcc58 -s ours am: 9290f7b3 -s ours am: c75430eb -s ours am: aa390948 -s ours am: c28c8ea4 -s ours am: 14a63e16 -s ours" into sc-v2-dev-plus-aosp am: 2349add3 -s ours

am skip reason: Merged-In If212df3a3b7be1de0fb26b8e88b2fcbb8077c253 with SHA-1 11053c17 is already in history

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

Change-Id: I1efeb34affc0fc1282267b27bec9b690b0cc4903