am a0c7a576: am 08ee7fa4: Merge "Fixing emergency dialer flicker on lock screen (issue 5314293)" into ics-factoryrom

* commit 'a0c7a5765dbbd255f9a122ba8829ca44032acde0':
  Fixing emergency dialer flicker on lock screen (issue 5314293)