Merge changes I8be6ace3,I15551370 into main

* changes:
  [Flexiglass] Clean up deprecated GONE users
  [Flexiglass] Fix BiometricsUnlockController