Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev