[automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: ec304d206e -s ours am: 368b18ee65 -s ours am: f000fc2fce -s ours

am skip reason: subject contains skip directive

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

Change-Id: I339bd59d2b536137297fb614855d7a6b160bbda2