Merge "Fix logical error in UID idle/active handling" into rvc-dev am: c8f7d50cd0

Original change: undetermined

Change-Id: I899ebe4b0cfde400c3163e27cbd9d0a2b52aeb7d