Merge "Add 6 more fields to ForegroundServiceStateChanged" into udc-qpr-dev