Merge "Add a #setOneOffTimeoutForCurrentThread method to system server." into main