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

Change-Id: Ibb5a539d306c58a21844ff97e0ac2678dd55c8e3