Merge "Append platform classpath proto configs with missing apex jars." am:...

Merge "Append platform classpath proto configs with missing apex jars." am: a580b5ef am: f8f2d7b4

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1739054

Change-Id: I825921148500db99b1f8a0fb3f6acadba2d023ac