Merge changes from topic "b241229236_stable_sort_flagged" into tm-qpr-dev am: 00f287b8

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



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