Merge "Merge "Fix issue #62524613: Background limitation is not working as expected..." into oc-dev am: 2b20d552bd am: 3d268c9b7b" into oc-dr1-dev-plus-aosp
am: d59b0c4d48

Change-Id: Iecfcd2895ba2f41864dd3e8c85d363d0865af5ec