[automerger skipped] Add strict_mode: false am: 97cbdbcf -s ours am: 2a84571a -s ours

am skip reason: Merged-In I4b4f2ef9a21926eef63fcada81355b928bbe2870 with SHA-1 a75ea0b8 is already in history

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



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