Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH

bug: 23003940
Change-Id: I88d71bf3cd01eea1217e1113ec4e941048d4cea9
2 files changed