Merge "Lower watchdog timeout for ChooserTargetService responses" into oc-mr1-dev
am: cbe8754184

Change-Id: I96573018654de3cfccdae1be6ce01ae7749c5ffe