[automerger skipped] Merge "Send showNewUserDisclaimer broadcast when user switching" into main am: 3db716220a am: c2d38ca2ae -s ours

am skip reason: Merged-In I00eb7e02b2d348cb6baae74a48ef170372fde385 with SHA-1 88578d5b98 is already in history

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

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