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

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

Change-Id: Idd7fbf0b35260a8146d029337cb3de7d29a14ed8