Merge "Updating typeconverter_tests audio_policy_configuration import" am: 2b7dd0efbd

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1518018

Change-Id: I4a15057e182c708f34d060ab3b17fee4f2a8b83b