[automerger skipped] Merge "Split bettertogether test case into router and...

[automerger skipped] Merge "Split bettertogether test case into router and session test cases" into main am: 3b21bc62 am: b327cd8a -s ours

am skip reason: Merged-In I7a748f2287b0d1c9d40c2627452b1a758ae59c8a with SHA-1 30f8c511 is already in history

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



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