Merge "Use separate color for popup when on top of another surface (folder/all apps)." into sc-dev am: 19c1b86bc3 am: 2f5a07ce15

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

Change-Id: I9f42e970ebe76bb02f0883ebf266e8ba2cb88539