Android Things Smart Clock FCS
Merge cherrypicks of [7177747, 7178670] into oc-mr1-1.7-iot-release

Change-Id: I05e74afb5ad09a22b5fb2194c18828369f943ffb