Replace manual genrule modules with combined_apis am: ec450c058e am: 4edcb7efa2

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

Change-Id: I5c433655cf921d3790224e08890f1bca70559089