[automerger skipped] Get entitlement configuration from intent extra am: 6d2c010891 am: 017dd38916 -s ours am: f5dc453a8b -s ours am: 5497e1a929 -s ours
am skip reason: Change-Id I3d06df01302a9c1f0893712d9250fe394dc66588 with SHA-1 e22bd7a2e8 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344639
Change-Id: If09c2e2108fa76a53bd870f09fbf7164fa31ec9d
This commit is contained in: