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

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

Change-Id: Ia40b80e65daffb9e67c67c1ccac327f23d54481d