[automerger skipped] Merge "Freeze audiocontrol@1.0::types." am: d0094c65f8 am: d8321fdc3b -s ours am: 2ffa077f4d -s ours

am skip reason: Change-Id Ied59b4ba94c8b6bb9e3ead869d8341cffa86f1e8 with SHA-1 6b72cf0a74 is in history

Change-Id: Ib0979fe625f2eb9882db57a86d44499f6bb1d0de