Merge "Add ChooserResult constructor to @TestApi" into main