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