Merge "Merge "CTS Verifier Tap-to-tone add overrides for report logging" into android12-tests-dev am: 99f84c89bc" into android12L-tests-dev