Merge "adbd: remove ifdefs guarding root/secure." am: 536f220f am:...

Merge "adbd: remove ifdefs guarding root/secure." am: 536f220f am: 3ea63f16 am: 4ff61ec9 am: 59a489ec

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

Change-Id: I73b7f3988b04ede9f92232a3063d9c450f97b4ba