Merge "Merge "Improving comment inside expandWithQs for special split shade...

Merge "Merge "Improving comment inside expandWithQs for special split shade case" into tm-dev am: 7144969d am: 5fe2745f" into tm-d1-dev-plus-aosp am: 8a394ea7

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



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