tree 08907eea51d73936ca184fd8329a2b0e1edfd170
parent 3da1090ce6879bb4956214da9fab2ba49b117e62
parent 78619286d35480c85b1104295deeacd565549b1a
author Lucas Lin <lucaslin@google.com> 1620729002 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620729002 +0000

Merge "Replace hidden API with public API" am: 7283a692b0 am: 78619286d3

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

Change-Id: I73eb1314cc4c894d9c4b7455588da7557eb792fb