Merge "adbd: support ro.adb.nonblocking_ffs."
am: c7a409036e

Change-Id: Ib8bd70545cbb5acbf4ed9d1f3272b9e0fa8a421b