Merge "Revert "Return anonymized MAC for apps targeting SDK < 30""