Merge "Use AIDL for test vendor properties." into main