Merge "Add featureFlag for icon in textheader" into tm-qpr-dev am: 0abe8af6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21074659



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