[automerger skipped] Merge "Merge "Made AutofillId.withoutSession is testable." into rvc-dev am: 234a31e2f5 am: d199a42291" into rvc-d1-dev-plus-aosp am: 8e377271db -s ours
am skip reason: Change-Id I27d1227f858aac83b3de1cb8ef719edf177524dc with SHA-1 24abde551e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716078
Change-Id: Ic681aec97ab2f2b0e766315c2d0ca1c70dcee73a
This commit is contained in: