[automerger skipped] Merge "Mark RSSNR in 4G as an optional support, and vendor dependency" am: ebfc8c2efb am: f2c4d3677b
am: 02b6667e64 -s ours
am skip reason: change_id Iaf42797b2d388843778ce5fedbd28861f340ec5c with SHA1 42f01a6477 is in history

Change-Id: Id8bcbf742b4806d2aba0d68d68d2af9ef9238b01