Merge "Catch Illegal argument exception" into sc-dev am: b04401df4e

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

Change-Id: Ie98111b9d98f71df2ab597754a731bf62d87e460