Merge "Fixing oav text overlap." into ub-launcher3-rvc-qpr-dev am: 6039c702 am: 11fb39a2

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

Change-Id: I5a3daf62e17a2deaf151a3cb9c6e7215f859a8a4