Merge "Mark RSSNR in 4G as an optional support, and vendor dependency" am: ebfc8c2efb
am: f2c4d3677b

Change-Id: I7cd1620877e41403a5d03f552c36547d6efef36b