[automerger skipped] Merge "Only apply entitlement check to cellular upstream" am: eea398a690 am: 068c1bbf8f
am: 80a19bfb31 -s ours
am skip reason: change_id Ic2980b4d6864d6f7287816c43eb6cf7a5cdec541 with SHA1 a0d280fc54 is in history

Change-Id: Ib112902daba115163fe66daa65694574bb0c2faa