Merge "TunerHAL fixes" into android12-tests-dev