[automerger skipped] Merge "Re-activate backup service after cleaning a profile owner" into qt-qpr1-dev am: c1e78426b5 am: 03cebe3202 -s ours
am skip reason: Change-Id I6f11642abe544c7df265ed7e2ad466d47796e7f9 with SHA-1 775b26d884 is in history

Change-Id: Ia047f13e3854172c2e93f41003fdaff9064987e7