Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into...
Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev am: 45d2ff9b am: f67cd1db
am: e6f2a82c
Change-Id: If32540bbc9e7cdf8ce733a7e43f15b26a3825ffb