Revert^2 "Fix bluetooth and aac dependency"

Fix aac dependency

It was merged with ag/17104648
It was reverted with ag/17153588
Merging again ! With the small change this CL could be merged on its own
without the bluetooth changes

Test: m CVE-2020-0451 CVE-2019-9362 CVE-2019-9357 CVE-2019-9308 CVE-2019-9247 CVE-2018-9549 CVE-2018-9537
Bug: 220805766

2602f202a28842e7124b285c594a6186d4746006

Change-Id: I7172d94936e948a96888ae622515e250d513864b
7 files changed