[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
am: 439ed702da  -s ours

Change-Id: Ic356421428addee7dade6cf54d1438b1dc01a62d