Merge "Fix dumpsys for appops proxy field" into qt-qpr1-dev
am: 30c48bb54a

Change-Id: Id521633187bce10f41dce10ba4198bc42e9f363c