Merge "Harden construction sites of android::StrongPointer." into main