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: I27875b91cb1928b5bba0f4ed537e7cf1c23d0c16