Merge "Fix issue #62196301: Pre-O background restrictions allow starts..." into oc-dev
am: 952d68fa85

Change-Id: Ic1dfd9537fb97bf896ac73709d900023696bf14a