Merge "Fix margins between headers and tiles." into sc-dev am: d7881573 am: bc100d61 am: 4d3a82a0

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

Change-Id: I965ab0bc75d8f3bce85f1d8dd37d8d100cdff7fc