Merge "Revert "Remove Activity Recognition from the Android Code.""