Merge "Fix issue #65359137: Apps with target API 26 can bypass background..." into oc-mr1-dev
am: 2556236f8e

Change-Id: Ib3498106274ce5a0b832d4fd7f56396979f24a75