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

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

Change-Id: Ia783de8507a970a9bf830a7afade4165d33c7763