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

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

Change-Id: Ied9135487287293659cc407f11ea1b4ba8d841de