Merge "Smoother signal bar transition during CBRS data switching" am: c67dbaa94c

Change-Id: If6b4d47e3c03b1957aa4c3b5e403ababefcfc946