Merge "Change order of owners." am: 0d72e983ce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I982967d4c4c9e3ad94558dd0df76ed626352d489