Merge "Address sorting edge case." into sc-dev am: ab3f902ccf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392295

Change-Id: Ia4f9f742cb2a84b8e94bca7b94b0b07399d27ccf