Merge "Temporarily bg-whitelist the default container package-cleaning service" into oc-dev
am: d47e192d7c

Change-Id: I0bd22bd1dfac0ba071ee9af791fb983c89f20bac