Merge "Added Fingerprint Virtual HAL AIDL extension" into main