Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
am: acd647d95e

Change-Id: I37a2e6f002ff611d4efd915782852e1e65c1a459