am 3a9c049d: am 61a75423: Merge "Follow up CL for heads up notification refactoring" into mnc-dev

* commit '3a9c049d03b250cf309895179821604a443a961a':
  Follow up CL for heads up notification refactoring