Merge "Update missing exclude items in cts-on-aosp-exclude.xml"