am 421eaa78: Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev

* commit '421eaa7813e33ea1bbce398e5940e6ab477c759d':
  Fixed NPE when dumpSettings is called with a null cursor