Merge "Consolidate fingerprint overlay controllers." into sc-v2-dev am: bf5ad9066a am: b500536d14

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750027

Change-Id: I577464a7d55b369ff2b5e7f1f685f9e4d5e4ce6a