Merge "Add callback-based support for Hardware Activity Recognition. b/17112184"