tree 944f5bd1de34fd215d81e2aeb2432d62d63a44fb
parent 1f6f0a774325d7c8c4eb3c66d70c41253a017a42
parent b605d649f4fcbacdfa26f499366ac7ca74ad9a5c
author TreeHugger Robot <treehugger-gerrit@google.com> 1591891064 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591891064 +0000

Merge "Pass entitlement configuration to Settings for entitlement check" into rvc-dev am: 03cfdd49b6 am: 10ede1fcae am: b605d649f4

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

Change-Id: I0fead8f6fbab6e9594fc7380c959872c0ebb65b7