Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I5c0fe4b0b3be7191d42db14195791d8a8bee503c