[automerger skipped] Merge "Smoother signal bar transition during CBRS data switching" am: c67dbaa9 am: 6c5e9c68 -s ours am: 590b50da -s ours am: 58bae374 -s ours

am skip reason: Change-Id I45d2558510bcd1b86b001f723bbd3dd8dc3a3914 with SHA-1 0c63c4da is in history

Change-Id: If2749adb21732f56b4fc2a4ed5326ca53636a4a2