Merge "Biometrics: Add back import needed by lint." am: 3164fcbb4c am: 18b6ffe526

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

Change-Id: Idababfc46994097ad725698c259696add686efe6