Merge "ANDROID: Fix EventLog string class problem in ViewRootImpl#enqueueInputEvent()"