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

Change-Id: I79b6c04d2aca7543507f064bbe827f8d2ac9340d