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