Merge "Debugging issue #37272284: ActivityManager: SELinux tag not defined" into oc-dev am: 809f4cf121
am: 80cc3154ee

Change-Id: I3d4eb3d0a2922afc1a3ef1a78cc4dae67f103163