Android Things Smart Clock FSI
Merge cherrypicks of [6454681] into sparse-5318058-L76800000268661260

Change-Id: I87c22f19295e9611d8de5b41e04fed7041987b38