[automerger skipped] Merge "Fix entitlement failed when device is on CBRS" am: 073c203dae am: 4e7c3ad945
am: 3986c7ac9c -s ours
am skip reason: change_id Icb3f5eeb2319e50b2dc98369ad152988c934da57 with SHA1 b46df202d0 is in history

Change-Id: Idc86e0fd5e4e088ac17253c9102c5edd3d3a2be5