Merge "Fix NPE in ActivityThread.installProvider()." into main