[automerger skipped] Merge "Update feature flag QS_SECONDARY_DATA_SUB_INFO in...

[automerger skipped] Merge "Update feature flag QS_SECONDARY_DATA_SUB_INFO in test" into tm-qpr-dev am: cfd69cce am: c066b2fe -s ours

am skip reason: Merged-In I1fafe71aef577849104b7d0095b1d7cf0283767b with SHA-1 e90622bf is already in history

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



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