Merge "[adb] Cache features set inside the client process" am: 6e861740ff
am: 25fc86357a

Change-Id: Iddda000b218e08c2e335a06716c6cf0993e61165