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

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

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



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