Merge "Prevent setting the launch task id when docking." into nyc-dev am: 386a947616
am: fb8ff0fd31
* commit 'fb8ff0fd31dda76ad650b218b8d00a1c3f4b095c':
Change-Id: Iccbe65526c7dd7a313926846fffebd176d982e64
This commit is contained in: