Merge "Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d8 am: d38615b8 am: 63a79edb -s ours" into oc-dev-plus-aosp