Merge "Fix persistent   device search edu" into sc-dev am: 564ae64e04

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36e1b1eda749c6ed9432a65201e800ea4232ecdf