Merge "fingerprint: Include FP HIDL 2.2 in mk file" into rvc-dev am: aa423ac8da

Change-Id: I4fd819412eeb9f428d6f5d6dd927c12818ff9b98