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

Change-Id: I45354a577b49ec09b3f3fd879f059d676eb42d54