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

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



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