Merge "Move SidecarConverterTest into framework/base/libs/tests" into main