[automerger skipped] Merge "Drop GNSS1.1 and Thermal1.0" into rvc-dev am:...
[automerger skipped] Merge "Drop GNSS1.1 and Thermal1.0" into rvc-dev am: 107aff14 am: 72469d40 -s ours
am skip reason: Change-Id I2c7cbf8f51925e55026a9f85382c8a22897eabaa with SHA-1 dbadfe39 is in history
Change-Id: I4c7b6bfd5aba9d65f0819305562e4d1c45b26650