Merge "Fix PowerStatsService dumpsys and include PowerStatsLogger info" into udc-qpr-dev