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

[automerger skipped] Merge "Made AutofillId.withoutSession is testable." into rvc-dev am: 234a31e2 am: d199a422 am: bd91c743 am: d83b6017 -s ours

am skip reason: Change-Id I27d1227f858aac83b3de1cb8ef719edf177524dc with SHA-1 91c3c2a9 is in history

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

Change-Id: Idd7254688618de4ac52e16fdae06ef03cc793abf