Merge "Update missing exclude items in cts-on-aosp-exclude.xml" am: d60b456097 am: 495aeaea05 am: c8138dea82

Original change: https://android-review.googlesource.com/c/platform/cts/+/1574987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc7c1734d68c8e169586f044ff5eca63e3bfb6bd