Merge "Move BasicShellCommandHandler to frameworks/lib/modules-utils"