Merge "Revert "Add ComponentInfo in sensor properties into dumpsys"" into udc-dev