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

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

Change-Id: I0f2322ac66b457201eb77650cfdc75569e6d17de