Merge "Return anonymized MAC for apps targeting SDK < 30" am: 4589c21ede

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1693685

Change-Id: I3c142e8c3cc15aadca564f5fa9e81cabdb5592b9