Merge "Fix entitlement failed when device is on CBRS"
am: 073c203dae

Change-Id: I682ec8f7b8f91be5e6735e141f4da06a18a11fe1