Merge "Delay unmuting sensor when device is unlocked" into sc-dev am: dc9a03db

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14846664

Change-Id: Icfa757398b223c4c761039a20123ac8a66d63ea8