Merge "Merge "Separate timeNumberFormatTrivialFormatLong into its own file and...

Merge "Merge "Separate timeNumberFormatTrivialFormatLong into its own file and delete HostnameVerifierTest." am: 2385e756 am: 63042c54" into tm-dev-plus-aosp am: 695e1ccb am: 4a908e75

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2096494



Change-Id: Iba16fe337184696b24130cad9322d03db2b56708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>