[automerger skipped] Merge "Smoother signal bar transition during CBRS data...

[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: 2cb229ae -s ours

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

Change-Id: I88d8019765694c062113b34d6eab733f66153ac6