Merge "Updating typeconverter_tests audio_policy_configuration import"