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

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

Change-Id: If25601a8cd9024de12655c73ac587ab116ad845c