Merge "Updating owners of SystemUI" am: 66712466b3 am: 386db4c245

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

Change-Id: I30c4cdd28db679f99eac2f1688270b6ffad35573