Merge "AdapterProperties: Add dumpsys support" into pi-dev