[automerger skipped] Merge "Revert "Stop & Resume property service when switching to bootstrap namespace"" into rvc-dev am: 293786f941
-s ours
am skip reason: Change-Id I2e11b782fcd2b7baded133a841fdcf519f702b84 with SHA-1 459ca0be74
is in history
Change-Id: I9fa67a5331b9c1bafb9715d4bd39492be60636ae
This commit is contained in:
commit
50e25c5ca5