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

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

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