Merge "Reduce double header spacing in Conversation and Call notifications." into sc-dev am: d1bd8119c4

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

Change-Id: I47dffabaae1e1e8ef247172213de459e50998b68