Merge "Merge "Use ro.build.version.known_codenames sysprop for KNOWN_CODENAMES." am: 19c5ee8bf1 am: 247988066c am: c8d4c8faf8"