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

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

Change-Id: I9ca8b89df61d426e79d01fb8b540d4df7627e30c