am 5e28b3a5: Fix favorite ordering bug (http://b/issue?id=2197247)

Merge commit '5e28b3a5e44bf4f2c0980c50a2ab35350fc5f230' into eclair-plus-aosp

* commit '5e28b3a5e44bf4f2c0980c50a2ab35350fc5f230':
  Fix favorite ordering bug (http://b/issue?id=2197247)