Merge "Move "Received files" in BluetoothSettings" into oc-dr1-dev
am: d55579889a

Change-Id: I5c689e2f50f06c6501a771dd957e4408e888a092