Merge "Add keep sorted tags" into main am: 53b33d07 am: 588e2a49 am:...

Merge "Add keep sorted tags" into main am: 53b33d07 am: 588e2a49 am: d42b7f24 am: d3d3402e am: ce7dcda9

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



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