Merge "adb: don't cache failure to get features." am: 7cd7b68f5d

Change-Id: I7e4aa9f971502f5c9d5eb8b87d492977ba2f4eeb