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: 0b5c2a1d

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



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