Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev
am: b9bb518632

Change-Id: Id8c2d014c1d66e7f1cd1a83e7074d46bc57e8644