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

Change-Id: I56946e9a2868ea232a02fa2c4919d33c9d0647c0