Merge "Sort always convert by type list" into main am: 35f1ae07 am:...

Merge "Sort always convert by type list" into main am: 35f1ae07 am: 48b66491 am: 69be5dd7 am: 72ea2dc6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2754805



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