Merge "Merge "Update owners file" into sc-qpr1-dev am: 51f1231c am: 4bee8464" into sc-v2-dev-plus-aosp am: 68b2d050

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15796037

Change-Id: Iae798e3dea921af2f148644b5a5291202fc13781