[automerger skipped] Merge "allow CBR to write SMS database" am: b5090807...

[automerger skipped] Merge "allow CBR to write SMS database" am: b5090807 am: d6c6e3ea -s ours am: 058f730a -s ours

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

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

Change-Id: Ib98f46a7ef3af017123ee40a39195069d2f3c00b