Merge "Allow classes in system API to be changed into public API and abstracted." am: 88b832b0b6 am: 1d8da38c47 am: 255ec986b0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie471249cb5c58b5b36f68896c9162efd98ea1fa9