Merge "Fix NPE from onDestroy in sensor CtsVerifier tests b/17834381" into lmp-dev