Merge "Don't try creating files outside pkg-owned dirs on secondary storage." into qt-dev
am: 449deff3b8

Change-Id: I9f3b79e12894b1f1a03549d28dd4dd5986551048