Merge "Advancing our amazing bet on PINs." into nougat-mr1-cts-dev