[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: f78b6ea226 -s ours am: 53673dd2ca -s ours am: f3be85267e -s ours am: b7a9362868 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4673dff4f340fa9d3c6e176849e9cefbccbf6cd9