Merge "Update system server profile based on input method cleanups b/234882948"