Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev