Merge "Update ManifestGeneratorTest (fix build)" into oreo-cts-dev
am: e3faec3e92

Change-Id: I50fa36eb1d00849080a7388159030df72e972a08