Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" into pi-dev am: 3667b71225
am: 3f758d8e02

Change-Id: I807d66b5df30dc705b64c0a9e6f6feb66a36c4cd