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

[automerger skipped] Merge "Merge "Made AutofillId.withoutSession is testable." into rvc-dev am: 234a31e2 am: d199a422" into rvc-d1-dev-plus-aosp am: 8e377271 -s ours am: b91847db -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: I89772814ca2489fcca75c758aabff6b9cebcfba7