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

Change-Id: I908440191acf3269fe26b52ac64ab044bb88c696