[automerger skipped] Merge "Made AutofillId.withoutSession is testable." into...

[automerger skipped] Merge "Made AutofillId.withoutSession is testable." into rvc-dev am: 234a31e2 am: 4d616e10 -s ours am: ea44fc80 -s ours am: 20a1a816 -s ours

am skip reason: Change-Id I27d1227f858aac83b3de1cb8ef719edf177524dc with SHA-1 24abde55 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716078

Change-Id: I521bb653adf92ceaa13ca508c367d784df634c02