Merge "Promote the SEMI_STABLE_SORT flag from teamfood to droidfood" into...

Merge "Promote the SEMI_STABLE_SORT flag from teamfood to droidfood" into tm-qpr-dev am: 679ef9c1 am: 64e1da0f

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



Change-Id: I024ac4cfcacb8ee8fc8d6ef5025baa606504822f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>