Merge "Merge "Ambient: Re-register all trigger sensors if one fires" into...
Merge "Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev am: b9bb5186 am: 1a299d80" into nyc-mr1-dev-plus-aosp
am: ebd12647
Change-Id: Ib8dcab5fbfcc6b4d864202b0b8aeffc15fe793e3