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

Change-Id: I659115cec0db8ccae778e1b842a08bb04c63e10f