Bug: 196103931 Test: manual (enroll via settings) Change-Id: I35aae96e4ebb0c13bc567bb926f2e7a549f554ba (cherry picked from commit 6c582e97)