Merge "[automerger skipped] Merge "Clean up Call redirection setting" am: 9d6ac63e5e am: d4b3f65d35 -s ours am skip reason: change_id I9cb569bfd1ef5fba7958bb2e5f42f05e300e3358 with SHA1 fa9460a6f0 is in history" into qt-dev-plus-aosp