[automerger skipped] Adding option in global setting to control the display message during user switch am: a9feb4602f am: d29f0a6c64 -s ours
am skip reason: Change-Id I70c72d7d74c72a78d919ae34906b6f7b96466ad1 with SHA-1 e12de0beb4 is in history

Change-Id: Ieaefce68c10856e68d970a834ce7abee05c33fee