Merge "Changing the unit for the line height of text in notifications to sp"...

Merge "Changing the unit for the line height of text in notifications to sp" into udc-dev am: e9defd54 am: 54f9fad5

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



Change-Id: I3f68ab9074cec3ba12bb1da91195007284a147df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>