Revert "Passion feature 2179737: allow the "now playing" activity to show without unlocking the phone."  DO NOT MERGE

This reverts commit 0657c9efaa7146d5f2ab169ca46c48a22f64e893.
Seems to fix b/2261008, needed to get MR1 out the door.
1 file changed