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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11694341

Change-Id: I74ec8a826fb09e26131024cf56132c6415e518d6