Merge changes I91ea9027,I19f2ae7e

* changes:
  Add keep.xml to keep string resources for spam.
  Replace TextView with BidiTextView in the new call log where a phone number can be shown.