Merge "Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev...

Merge "Merge "Expose necessary SystemApi as test API for CEC CTS" into rvc-dev am: a7dc4def am: 023916bd" into rvc-d1-dev-plus-aosp am: d384fe64 am: 97cacf03

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

Change-Id: I9218d4a74a7da42d8550f3a12961dad4a7b95c79