Merge "Add flags for new restore icon treatment" into tm-qpr-dev am: 575048df

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



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