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

Merge commit 'a48ddb6e3a888c72765bf83a5705c544995f5340' into eclair-mr2-plus-aosp

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