Revert "Stop & Resume property service when switching to bootstrap namespace"

Dependent change was reverted.

This reverts commit 352ae2d2.

Bug: 150863651
Test: build
Merged-In: I2e11b782fcd2b7baded133a841fdcf519f702b84
Change-Id: I2e11b782fcd2b7baded133a841fdcf519f702b84