[automerger skipped] Merge "Merge "Merge "[pm] Move CtsContentTestCases to...

[automerger skipped] Merge "Merge "Merge "[pm] Move CtsContentTestCases to postsubmit for pm changes" into udc-dev am: bc366209 am: 98857405" into udc-d1-dev-plus-aosp am: 3296c429" into udc-qpr-dev-plus-aosp am: 5cc7bf35 -s ours

am skip reason: Merged-In I453a4151100ca42495e0f2473e5599dec38ab70d with SHA-1 0a96efba is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24356854



Change-Id: I2257641a04d4dfc70058b09f56f214a2dc5b5537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>