[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev
am: 078d4d14 -s ours
am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e is in history
Change-Id: I10b999bd28d4625915e53ae3bedf7fcf74df4c6b