Merge "Merge "Revert "Advancing our amazing bet on PINs." DO NOT MERGE" into nougat-mr1-cts-dev am: d9e0e76909  -s ours" am: eb6e330495  -s ours am: 51305d6bc1  -s ours
am: f54d7f5cea  -s ours

Change-Id: Ib64a624c0ad3e9c1db3d622f9e27949f3a088eb9