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

Change-Id: I20e1cc3a4f0a015a18a6f26bd78f7d1929b51380