[automerger skipped] Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into pi-dev am: c0175af954
am: 7f812ed0bb  -s ours

Change-Id: If36a01bfb13aae49ade3af3e8fbd744d720746e4