Merge "Add support for MTP perceived device type property." am: b6ed343e85
am: 7644b885c7

Change-Id: If09ce7609ff999c7dc32d7cc5db4917eae50748c