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

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