Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev...
Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev am: b9bb5186 am: 1a299d80
am: 84aa0f12
Change-Id: Iff0188d21d15a3aaaa9e61659749eeb4448e14e8