Merge "Let jorgegil@ replace xutan@ as a WM shell owner" into main am: 7a0ee810 am: aacab183

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



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