Merge "Merge "Fix NPE on ActivityStack.removeTask when launched with invalid taskId" into qt-dev am: 1e09d0e489" into qt-dev-plus-aosp
am: ba6a7fa818

Change-Id: Iba81962a020dc274775b886287efc6ac20b93e8f