Merge "Add biometric component info and face type into SensorPropertiesInternal" into sc-dev am: 82a38b099e

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

Change-Id: I32943a83c6da27d83702cc85b69b00dc48fa44c7