Merge "Add myself to owners for desktop" am: 0573ebd9 am: b97a6b41

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



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