Merge "Fix sanitizer in ISensorService list functions." am: 6f1f7b9882
am: 07f9d82b09

Change-Id: Ic94ece09a1709fc4c818ca0db885c181c2ff09aa