Merge "adb: Correctly drop caps when ambient capabilities are used" am: 44f78bed19
am: 00b2dffd38

Change-Id: I452f9f2620a0fbd4e2e8d08e90330fb275e2a161