Merge "Merge "Adjusted the lineHeight for notification texts" into pi-dev am:...
Merge "Merge "Adjusted the lineHeight for notification texts" into pi-dev am: a98a27e4" into pi-dev-plus-aosp
am: bc9aad52
Change-Id: I1dc20418fa8bd1fa6166dd7e6ca558b3d53d1be6