Merge "Catch Illegal argument exception" into sc-dev am: b04401df am: 79d83e88 am: 26e3f0f4

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

Change-Id: I9e9aac9c11dc9d2095e1c1776c8ab7b0d22e9ad5