Merge "Follow up for ag/11916646" into ub-launcher3-rvc-dev am: 5c33e250fc

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

Change-Id: Ia631a5640026628b967814f370e38921ff9186f5