Merge "Do not play sounds when unlocking from AoD." into oc-mr1-dev
am: dd68a88a51

Change-Id: Idd190bc16ed78da0322b3f963be29792c9fe6173