[automerger skipped] Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev am: dc2db6c6c9
am: 0886bf2271
-s ours
Change-Id: I77850967d6d28f6f638bb7327def038e365c653c
This commit is contained in: