Merge "Convert CombinedApis's GenerateAndroidBuildActions to use ModuleProxy."...

Merge "Convert CombinedApis's GenerateAndroidBuildActions to use ModuleProxy." into main am: d8c9b4ed am: 1a34e943

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



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