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