Merge "Mark uid as non-idle/FG-entitled when launching for fg service" into oc-mr1-dev am: 93243bf808
am: b39679d4c4

Change-Id: I9284ceee64957730cb6a9e0cd8542ae528808a8c