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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia939ebc4c633fb7c75f729a42571098e9b318752