Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""

This reverts commit 3bce5d4a172f1b7e7612a64f22075867b9b85b73.

Change-Id: I06519a5bbd0a45bbc9c1a21855f59172f9bb0817
3 files changed