[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: 086309d1 -s ours am: 8c1ce577 -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: I442b670ec982f76c67e1853fa37b5d00ded38838