Merge "Use more generic assertThrows instead of assertThrowsExceptionName." into sc-dev am: 19898ae400

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/13828111

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18e74d61a8b98890cdffd986b5c97a2eb6bff0d2