tree f8eebeadbabf10e6023f49355f985fd15860523a
parent 98170a36dd4bf5a40545c000596b60bc7947bfa8
parent 80a19bfb312d33f4c5515e174cdc899d6a7f01ab
author Mark Chien <markchien@google.com> 1553769091 -0700
committer android-build-merger <android-build-merger@google.com> 1553769091 -0700

[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