Merge "Fix the order of suffix in Android.bp" into main am: 09de1731fd

Original change: https://android-review.googlesource.com/c/platform/development/+/2753590

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