Merge changes from topic 'am-e885a22f20324bb0b94c97a807186535' into nyc-mr1-dev-plus-aosp

* changes:
  Merge "Suppress unlock notifications on non-FBE devices." into nyc-dev am: a39d888651 am: 3f9059fb8d
  Merge "Replace caribou wallpaper without the stars b/28339724" into nyc-dev am: b3d4ad2205 am: 7eb7b41510