Merge "Merge "Refactoring of AppOps pullers." into rvc-dev am: 8907d917dc am: 97ba83880d" into rvc-d1-dev-plus-aosp am: fbbcf01d79

Change-Id: I63e5a286d1a265be9bbef57bccb6ee82531e39fe