Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711f -s ours" into nyc-mr2-dev-plus-aosp