Merge "Fix dumpsys for appops proxy field" into qt-qpr1-dev