This reverts commit96a8ccd4a1. Reason for revert: Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed Bug: 200055138 Bug: 170964303 Bug: 217241995 Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6 (cherry picked from commita4d835af3a) Merged-In:I9c42df15defec428c9ef8c62439c63d4a603fee6