[automerger skipped] Merge "Keep app in high memory adjust if moving from TOP to FGS" into pi-dev am: 311f0f5da5
am: 0631cca3ff  -s ours

Change-Id: If3a6974ec78f9a6da774a21be6b1ec0a6e31416c