Merge "Revert "Drop GNSS1.1 and Thermal1.0"" into rvc-dev am: 9b0f15d5e1

Change-Id: I1a47e27758ad04ad9d128765b477a1e57943ab64