Merge "Only apply entitlement check to cellular upstream" am: eea398a690
am: 068c1bbf8f

Change-Id: Iab4e067c3fec1c3b150559bfedc5643cf6c7476a