Merge "Merge "Update behavior of setDestinationInExternalPublicDir()." into qt-dev am: e2ce2e00ca" into qt-dev-plus-aosp