Merge "Move notification scrim behind clock" into sc-dev am: 68897d12 am:...

Merge "Move notification scrim behind clock" into sc-dev am: 68897d12 am: 85099c6b am: 6e786620

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

Change-Id: I991aaf4d1ed43d4eba9e9766c501f9bbbd63b346