Merge "Add android.permission.DUMP to manifest." into lmp-mr1-dev