[automerger skipped] Merge "[DO NOT MERGE] Add lihongyu@ and mariiasand@ to WM...

[automerger skipped] Merge "[DO NOT MERGE] Add lihongyu@ and mariiasand@ to WM OWNERS file" into sc-dev am: 926a7ee3 -s ours am: e76a4415

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

Change-Id: Id6b5e35e6a1b441c19a20bfe9e7c8218c4fa3e54