Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev