Merge "Use FLAG_IMMUTABLE for ServiceStateTracker" into rvc-dev am: ebc187d0e0

Change-Id: Ied0285cb0b2263c2a665f40f9433708dc2636e8e