Merge "Make platform_mappings file deterministic" into main am: f51ed265 am:...

Merge "Make platform_mappings file deterministic" into main am: f51ed265 am: b942e672 am: e8e3c1d4

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



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