[automerger skipped] Merge "Move Owners up to cover display module" into...

[automerger skipped] Merge "Move Owners up to cover display module" into udc-qpr-dev am: 20fb0051 am: 9a3bfc6c -s ours

am skip reason: Merged-In I389d2d71787b4f3cba55256fb0fd807442295a45 with SHA-1 322a6077 is already in history

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



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