Merge "Fix b/284496479: Crash when opening App Info page" into udc-dev