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

Change-Id: I53aea1f2845dc56cad468c793e32db4dcf5065fe