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

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