[automerger skipped] Pass entitlement configuration to Settings for...

[automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 4b198cb8 am: f7d9dd76 -s ours am: e37ca4b0 -s ours am: 197eefae -s ours

am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 b1cb53b4 is in history

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

Change-Id: I7c1fdc3e1cfefd33cbbc8bc61c4b0c8ea569530e