Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev am: 546ba589a2
am: 84376cb95a

Change-Id: I096470de6d03ab34591b12bc7172056a1ffe38ed