Merge changes from topic "parse_audio_config_for_le_device" am: f0dd744ba6 am: d45c9f3d32

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909755

Change-Id: Ia470e03e1cd234755fac022dca78f49822ddbc32