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

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

Change-Id: I35e8271aa43f448c2e9a30a29a2565a91b1e3963