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

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



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