Merge "Add scroggo to SF owners" am: 43a5598fbe am: f6cdbf321a am: ff50a1166b am: 4a91c4a21f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1975267

Change-Id: Ica317e7874c16d3eee6a0fd0ecda7bb45ff8d936