Merge "refactor of api_levels map for  soong injection" am: d3ffe6475e am: 9ece38f0b5

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

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