Merge "Not assuming reverse order of menu shortcuts" into sc-dev am: 5c97cb689d

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

Change-Id: Ic45ce98fd6ba56e4d913eed5fc3cbc842ce94ce2