Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan"
am: 041eb388de

Change-Id: Ida6b217b550bd98157afdfc98f2e8ec16232a2eb