Merge "Sensor: Make switching from data injection mode to normal mode more productive"
am: e6a4e9b04e

Change-Id: Ic5b3c3bb1856d70a0e12878f8ecdd2cf81868152