Merge "Enable Gyroscope sensor injection by AIDL flag" into main