[automerger skipped] Merge "Updating typeconverter_tests...

[automerger skipped] Merge "Updating typeconverter_tests audio_policy_configuration import" am: 2b7dd0ef am: 26bb53de am: bbd0c01f -s ours

am skip reason: Change-Id I29720b33791d213041f71e50894ee0e88a3679fb with SHA-1 46171276 is in history

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

Change-Id: I49274c8ea443b946a0158f2c4c4e94d600d86d27