[automerger skipped] Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev am: 546ba589a2 am: 84376cb95a am: abff788177  -s ours
am: bc890b6608

Change-Id: Ic31303bbe6238b1cad72991004a1607a257b732f