Merge "Simplify stub TextServicesManager in layoutlib"