Merge "Fix checkNotNull error for missing Vpn service in Wear" into main

            public VpnManager createService(ContextImpl ctx) throws ServiceNotFoundException {

                IBinder b = ServiceManager.getService(Context.VPN_MANAGEMENT_SERVICE);

                IVpnManager service = IVpnManager.Stub.asInterface(b);

                if (service == null

                        && ctx.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)

                        && android.server.Flags.allowRemovingVpnService()) {

                    throw new ServiceNotFoundException(Context.VPN_MANAGEMENT_SERVICE);

                }

                return new VpnManager(ctx, service);

            }});