Merge "Fixed that HUNs wouldn't show when the keyguard is occluded" into nyc-mr1-dev am: 45d2ff9b6a
am: f67cd1dbe9

Change-Id: Ia84fbef6b57204c29e2ebe63d9fec7b0d17c2ab9