Merge "Don't require unlock to dismiss a media control" into sc-dev am: d565aaa1 am: 2c65906f am: 201bf7c5

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

Change-Id: I1e352b29aa988fac40b8fba559bb5552d7f054a0