Merge "Fix sanitizer in ISensorService list functions." am: 6f1f7b9882 am: 07f9d82b09
am: d8f91eb357  -s ours

Change-Id: Ifbd6f261dfc27d187fa0630a2c511741a89e49ed