am 2440aa9f: DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch

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