[automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: d9c9ceecc3 -s ours am: 6772e75a3f -s ours am: 62d10a162a -s ours am: 2d5933ed56 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7809b520139a9279e357eff8dad9fac657e975fc