Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev