Merge "Fix issue #11323037: Android apk incorrectly marked as running in app processes" into klp-dev