[automerger skipped] Revert "Fix LargeTopAppBarNestedScrollConnectionTest for ag/26995613" am: b20ec5d28a -s ours

am skip reason: Merged-In Ib7d69f64cd955c9069c47293810178b5cebe2099 with SHA-1 fea8ce2534 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3087225

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

Change-Id: Ic00d1233b4fc5011ea7f0189fc03b5ce1644f300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>