DO NOT MERGE Fix robotests for AOSP

AOSP is still using snapshots w/ selective includes from the tree.
ApexInfo was missing from PackageInfo, hence the failures. Including it
in target and test.

Bug: 135192382
Test: m -j RunFrameworksServicesRoboTests
Change-Id: I83b0080db2bdc4c88eda6b5a027701973549a611