Merge "adbd: remove ifdefs guarding root/secure." am: 43602d3a34 am: 3ea63f1637

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1324037

Change-Id: Ie1d6eb5c7a1aea093ec3a3a816ec9c613f2e93c5