Merge "Merge "StateTracker handles active state changes" into rvc-dev am:...
Merge "Merge "StateTracker handles active state changes" into rvc-dev am: 0d455533 am: e806ea28" into rvc-d1-dev-plus-aosp am: e481191e
Change-Id: Ice40cdf347db450113db129a00732671b19c422d