Merge "Revert^2 "InputManagerService: fix requireNonNull failure messages"" into main