Merge "Made AutofillId.withoutSession is testable." into rvc-dev