Merge "Allow specifying a network for SNTP time sync" into pi-dev

diff --combined config/hiddenapi-vendor-list.txt
index 0230ad9,bc2d747..2477b57
--- 1/config/hiddenapi-vendor-list.txt
--- 2/config/hiddenapi-vendor-list.txt
+++ b/config/hiddenapi-vendor-list.txt
@@@ -113,6 -113,7 +113,6 @@@ Landroid/hardware/display/DisplayManage
  Landroid/hardware/display/DisplayManagerGlobal;->getRealDisplay(I)Landroid/view/Display;
  Landroid/hardware/location/GeofenceHardware;-><init>(Landroid/hardware/location/IGeofenceHardware;)V
  Landroid/hardware/location/IActivityRecognitionHardwareClient;->onAvailabilityChanged(ZLandroid/hardware/location/IActivityRecognitionHardware;)V
 -Landroid/location/IFusedProvider;->onFusedLocationHardwareChange(Landroid/hardware/location/IFusedLocationHardware;)V
  Landroid/location/IGeocodeProvider;->getFromLocation(DDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String;
  Landroid/location/IGeocodeProvider;->getFromLocationName(Ljava/lang/String;DDDDILandroid/location/GeocoderParams;Ljava/util/List;)Ljava/lang/String;
  Landroid/location/IGeofenceProvider;->setGeofenceHardware(Landroid/hardware/location/IGeofenceHardware;)V
@@@ -308,7 -309,6 +308,6 @@@ Landroid/net/RouteInfo;->selectBestRout
  Landroid/net/SntpClient;->getNtpTime()J
  Landroid/net/SntpClient;->getNtpTimeReference()J
  Landroid/net/SntpClient;->getRoundTripTime()J
- Landroid/net/SntpClient;->requestTime(Ljava/lang/String;I)Z
  Landroid/net/StaticIpConfiguration;->dnsServers:Ljava/util/ArrayList;
  Landroid/net/StaticIpConfiguration;->domains:Ljava/lang/String;
  Landroid/net/StaticIpConfiguration;->gateway:Ljava/net/InetAddress;