[automerger skipped] Get entitlement configuration from intent extra am:...

[automerger skipped] Get entitlement configuration from intent extra am: 6d2c0108 am: 017dd389 -s ours am: f5dc453a -s ours

am skip reason: Change-Id I3d06df01302a9c1f0893712d9250fe394dc66588 with SHA-1 e22bd7a2 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344639

Change-Id: Id2df5e5ebad706e4269075294aba0a09ce12ed14