[automerger skipped] Merge "Moving flag creation to a separate file" into...

[automerger skipped] Merge "Moving flag creation to a separate file" into tm-qpr-dev am: 1297f400 am: e7fe6b57 -s ours

am skip reason: Merged-In I31014e397690379024d2e42c0e913ce806b9569c with SHA-1 749983b1 is already in history

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



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