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

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

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



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