This reverts commit 8094880025.
Reason for revert: changed services order
Test: manual
Bug: 136261465
Change-Id: I2f78f0dbbace212309b87f779efad020cf255196
This reverts commit 8094880025.
Reason for revert: changed services order
Test: manual
Bug: 136261465
Change-Id: I2f78f0dbbace212309b87f779efad020cf255196