Merge "Remove @hide symbols from NativeDaemonConnector" am: 68d5b22c2d am: f8fb1fe955

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1899031

Change-Id: Ieb26f53f3c96304c2378a0319a1791bb52dd7e8b