Merge "Ambient: Re-register all trigger sensors if one fires am: 0288dcc8...
Merge "Ambient: Re-register all trigger sensors if one fires am: 0288dcc8 am: 7157eb84" into nyc-mr1-dev-plus-aosp
am: 7f49d4dd
Change-Id: Id3b5384520af32ccbb11bd2c9b366f2dff2ef693