Merge "Remove declaration of hidl manager -> base dep" am: 4ff4b2ee17 am: 742771fdd7 am: e798d05a73

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

Change-Id: I053f441b90c710a7fed75705b3e170b890acb193