Merge "Adding a case when there is only 1 system shortcut on the Popup...

Merge "Adding a case when there is only 1 system shortcut on the Popup Container" into tm-qpr-dev am: 2545f45a am: 2c102c3b

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



Change-Id: I9a684963b00da3ff6a994221cfece78846dbae32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>