Merge "ppp: Allow specific ioctls on mtp:socket." am: 11ce09bc14
am: e8acb4f620

Change-Id: Iab0ebf0748c4c3dda5a7505050d3f87d5ddf0608