tree 944f5bd1de34fd215d81e2aeb2432d62d63a44fb
parent db97500dd36fa4382457d5ec40a74c2c3e1a2cdf
parent 10ede1fcae8c32aaede96f5999d6d55e6d916595
author TreeHugger Robot <treehugger-gerrit@google.com> 1591890160 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591890160 +0000

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

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

Change-Id: Ia9a0de93d250d0e153d467224a705af3f58e5501