[automerger skipped] Merge "allow CBR to write SMS database" am: b50908074c am: d6c6e3ea1f -s ours

am skip reason: Change-Id I5535cefb32e89694094299f3b89321f735983ef1 with SHA-1 1eff8d2232 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353206

Change-Id: Idb64a3163a2ec7ec26112542806cc5b83c951c67