Merge "Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae" into nyc-dev-plus-aosp