Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev