Merge "Use external pakcageName id if ActivityThread has no current PackageName" into qt-dev
am: ed63d133c8

Change-Id: I66d5f0e27751884ca445b6e5ce7cabd02d4cc03d