Merge "Fix bug where ripple extends out of bounds in pop up container." into sc-dev am: 576179199a am: c42dd630a5 am: 5760f9cc63

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

Change-Id: Id9296280312d5c61c70a8a3e19d1958998d4c6a4