Merge "Add private APIs to watch noted app ops - framework."