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

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

Change-Id: I19f44dfd65c68ea26445a253a571f70991c24b39