Android m preview
Merge "add request re-enroll to HAL API"