Merge "Change order of owners." am: 0d72e983ce am: 81ff12d6c1 am: e364dc06c4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1f16db7fea5e1ac83482da6c3212e03ee4b3923