Android Things Smart Clock r2
Merge cherrypicks of [7014755] into oc-mr1-1.7-iot-release

Change-Id: Ibd171de03c3e9c2f1c19b68484fa692590c32bc5