Merge "Updating typeconverter_tests audio_policy_configuration import" am: 2b7dd0efbd am: 26bb53def8

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

Change-Id: Icfe8a008386e8deab44bbe4d2ae933ae17db5282