Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6  -s ours
automerge: af857be  -s ours

* commit 'af857be53f762b7192dc33eb958a59fedf118e95':
  DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch