Merge "Add Xiaozhen Lin and George Chan to OWNERS" am: bb626dc6f7 am: 26379fe4e7

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

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