This reverts commit 1e0219774f.
Reason for revert: we need explicit declaration in SystemServer for non-mainline devices since they use flattened apex
Fix: 215565746
Test: presubmit
Change-Id: Ie0cbe03c21a18a185df54a9cd9b9a2ff1ae6f821
This reverts commit 1e0219774f.
Reason for revert: we need explicit declaration in SystemServer for non-mainline devices since they use flattened apex
Fix: 215565746
Test: presubmit
Change-Id: Ie0cbe03c21a18a185df54a9cd9b9a2ff1ae6f821