[automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours am: 1f5c10559b -s ours am: e3c5268531 -s ours
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 217d7b01f8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1253710
Change-Id: I7c1fdc3e1cfefd33cbbc8bc61c4b0c8ea569530e
This commit is contained in: