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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdee5dfbf0356839416b0f1054d234b53ded7b7a