Merge "Update OWNERS order" into main am: 7a4e1fd234 am: 4d08179ff4

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

Change-Id: I39cd52b9f4fc27f6a77bb2cfd149936cd6ccab2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>