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

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

Change-Id: Ib2067bbd8cfbf44215676699aba6168fe6e75e29