Merge "Set elevation of popup and arrow to match. This ensures no shadow overlap." into sc-dev am: 26a485bb2a am: b6efb6e2b5

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

Change-Id: I0b1db8d75b7f3dea62c974572a6fd1fca98fad0b