Merge changes from topics "cdma-null-island", "cdma-signal-strength" am: d5ba391425
am: 78f2c228d1

Change-Id: I4b821915c69aedd594747520186b2fb123d34b78