Merge "Roll forward: add a test for ParseException" am: 1f43a69d91

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

Change-Id: I17938abef561d95347869084114ee08f90d81db5