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

Change-Id: I75efa3cb1cbd86bd697188e34ae51c75866a44e3