Merge "Add heart rate to ASensorEvent" into klp-modular-dev