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

Merge "Revert "Changing the unit for the line height of text in notifications to sp"" into udc-dev am: e905d695 am: 55af0b3a

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



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