[automerger skipped] Merge "Drop GNSS1.1 and Thermal1.0" am: dc0e2f69ea am: 932ef01f95 -s ours

am skip reason: Change-Id I2c7cbf8f51925e55026a9f85382c8a22897eabaa with SHA-1 dbadfe396b is in history

Change-Id: I7fac2993bad2299838ed17246ae7be583d2388e8