Merge "Match Framework and AIDL SensorProps"