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

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

Change-Id: I9899af08ddf3cfc0c592a72dbba28774e1635760