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

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

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