am 4fc77824: Merge "Capture Build.VERSION.BASE_OS and Build.VERISON.SECURITY_PATCH" into mnc-dev

* commit '4fc77824f7707762a8f20c0c8833ebe399987132':
  Capture Build.VERSION.BASE_OS and Build.VERISON.SECURITY_PATCH