Merge changes from topic 'am-e4ceb878ab564c70a4e1726ee7c0709a' into nyc-mr1-dev
* changes:
Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d8886
Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad22