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

This reverts commit 5c8fd2faee9345ca982883fbe290f7c199762ca3.

Change-Id: I39052e7a4a5969a8c35fd11e53fef5ffda2b802e
3 files changed