Merge "Update fingerprint SensorLocation interface for multi-display" into sc-dev