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

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