Merge "Merge changes from topic 'sms-files-move-opt-to-base' am: abcc43d86a am: d38615b846 am: 63a79edbe0  -s ours" into oc-dev-plus-aosp