Merge "Update ManifestGeneratorTest (fix build)" into oreo-cts-dev am: e3faec3e92 am: 98cbf274fc am: cf89af5d64 am: 9b448191c4
am: 369eedc4d9

Change-Id: Ifd7f66fbcb0e27ab073b984bd48316633c76740e