Merge "Clean up STABILITY_INDEX_FIX and SEMI_STABLE_SORT flags which have...

Merge "Clean up STABILITY_INDEX_FIX and SEMI_STABLE_SORT flags which have already been released." into tm-qpr-dev am: 40c815bc

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



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