Merge "[Sb refactor] Fix active subId in group event flow" into tm-qpr-dev am: 63453604

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



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