tree a518310cfc6bcf99ea9569a5f45126fe4586fc3e
parent dd9b25c143d7b8da590ee0f8ea22bc80d90b2183
parent b05fa7f798be8607ad34c7a99918c322fde03494
author Mark Chien <markchien@google.com> 1591985262 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591985262 +0000

Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: b4ac5bc5b4 am: b05fa7f798

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

Change-Id: Ia73e1fdbf77d04d45bda1b5486c18d8d837bf692