tree 5db6f09ed2707b65a0dda21fa3399647b486231e
parent 66cdc1f38e7d1d5addee510a3a1b024a46254005
parent 36a6c5698934b05f26647714779fc10bae621c54
author Mark Chien <markchien@google.com> 1592377333 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592377333 +0000

Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 7e501e2967 am: bccb89a187 am: 36a6c56989

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

Change-Id: Ic89fe046e75a76aebf05e47c8754010f52a45536