[automerger skipped] Block the content scheme intent in...

[automerger skipped] Block the content scheme intent in AccountTypePreferenceLoader am: d782f9c4 am: 13b1a03e am: f45744f8 am: eff2f8b3 am: 16515105 -s ours am: 57ad521d -s ours am: dfc96575 -s ours

am skip reason: Merged-In Ica87087341cc983df04190919e33dc369fa18619 with SHA-1 8fa1dcb0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30469372



Change-Id: Ic31f492d237fb7f85f09439df64145259ce3e613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>