[automerger skipped] Replace manual genrule modules with combined_apis am:...

[automerger skipped] Replace manual genrule modules with combined_apis am: ec450c05 am: 4edcb7ef am: a3fcaf09 am: 49d11d48 -s ours

am skip reason: Merged-In Ia718f9374042e5fbb2168476f5bad3b1867b8a05 with SHA-1 648e609e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952377

Change-Id: I077ba24388b14b32da5d338eb39c099b64427985