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

Change-Id: Ifd1f6300a027ad994e57b2c070d180f6e867280d