Merge "Set max 2 lines for buttons shown in AddItemActivity" into sc-v2-dev am: a3b942972f am: 31aa57a82e

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

Change-Id: I0e5fe06de6d7a371c93fd21296c0e320bacfdca7