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

The build error is fixed in ag/755227

bug: 23003940

This reverts commit 1135c29ec4b7b33446f6e45bb2a76a309ab39fc9.

Change-Id: I548b110805f2efdb1731814897e1e6a2fb3878e4
2 files changed