Merge "Fix TunerHAL deadlock issue" into android12-tests-dev