Merge "[pm] fix potential NPE in system server" into udc-dev