tree f98c1347843b3b7ebcec301245c559e657847582
parent 716086b0971e19671204ca17392ab591002ab221
parent 8c35ceda7678293420e06ab14714ae9da3d6d328
author Victor Chang <vichang@google.com> 1624986699 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624986699 +0000

Squashed commits from aosp/master to mark some @CorePlatformApi as @SystemApi(MODULE_LIBRARIES) in sc-dev. am: 8c35ceda76

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/15105305

Change-Id: I8c7c04a3dc1155bee4fc1447a178fcca5da4da9a