Merge "adbd: remove ifdefs guarding root/secure." into rvc-dev am: ab7a967d am: 32679269 am: 4d4b0619

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

Change-Id: I122c529bd833878c9a103bedf2b9a756e7c200e4