Merge "Expose android.os.Build.VERSION.ACTIVE_CODENAMES to CTS" am: 644792c7d6
am: c2975a3850

Change-Id: I2c58d6c84d01d6f62ac081bd840386d27394cb39