Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
am: dc2db6c6c9

Change-Id: Id0362b8917255d81dfc83ecccc913aaa8c8349a2