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 am: 5545f6ae

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



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