am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

* commit '36c760140900b2bc6aa2c7287199dae4ca86c568':
  [Fingerprint] Show skip button during SUW