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

Change-Id: Ie90619d47d8b0bab4e6cef64592989699032fa91