Merge "DO NOT MERGE Add utilities for creating AppOps listenerIds" into rvc-dev