Merge QP1A.190205.002

Conflicts:
    libprocessgroup/sched_policy.cpp

Bug: 124069173

Change-Id: I0409464e297a67f5d615e50f928ff52da3bb7f31