Merge "Merge "Update lock icon transitions" into sc-dev am: d8cb97df am: dc66de53" into sc-v2-dev-plus-aosp