Merge "Merge "Expose android.os.Build.VERSION.ACTIVE_CODENAMES to CTS" am: 644792c7d6 am: c2975a3850" into qt-dev-plus-aosp
am: 456017a60e

Change-Id: Idd6cf4c9438ba3ce43cb7219d7e6a2ba487f9635